diff --git a/apt-cyg b/apt-cyg
index 0b36752..63e746d 100755
--- a/apt-cyg
+++ b/apt-cyg
@@ -92,8 +92,8 @@ function findworkspace()
 
   echo Working directory is $cache
   echo Mirror is $mirror
-  mkdir -p "$cache/$mirrordir"
-  cd "$cache/$mirrordir"
+  mkdir -p "$cache/$mirrordir/$ARCH"
+  cd "$cache/$mirrordir/$ARCH"
 }
 
 function getsetup()