diff --git a/.conda/post-link.sh b/.conda/post-link.sh
new file mode 100755
index 0000000000000000000000000000000000000000..a0f609571b5930d13d68a423c1ed94efdaa8183b
--- /dev/null
+++ b/.conda/post-link.sh
@@ -0,0 +1,8 @@
+if [ -z ${FSLDIR} ]; then exit; fi
+if [ ! -d ${FSLDIR}/bin ]; then exit; fi
+scripts="atlasquery imcp immv imglob"
+for script in $scripts; do
+    if [ -f ${FSLDIR}/bin/${file} ]; then rm ${FSLDIR}/bin/${file}; fi
+    ln -s ${PREFIX}/bin/${file} ${FSLDIR}/bin/${file}
+done
+
diff --git a/.conda/pre-unlink.sh b/.conda/pre-unlink.sh
new file mode 100755
index 0000000000000000000000000000000000000000..4a0dc27792b86996fe02a84d387378b62bfa6f62
--- /dev/null
+++ b/.conda/pre-unlink.sh
@@ -0,0 +1,5 @@
+if [ -z ${FSLDIR} ]; then exit; fi
+scripts="atlasquery imcp immv imglob"
+for script in $scripts; do
+    if [ -f ${FSLDIR}/bin/${file} ]; then rm ${FSLDIR}/bin/${file}; fi
+done
diff --git a/setup.py b/setup.py
index e9fa4e65851f5a7a4b43fe3aa1559ee9534c846c..356857dd6c237ef7a6f546b02060662078ca938b 100644
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,7 @@ setup(
             'immv   = fsl.scripts.immv:main',
             'imcp   = fsl.scripts.imcp:main',
             'imglob = fsl.scripts.imglob:main',
-            'atlasq = fsl.scripts.atlasq:main',
+            'atlasquery = fsl.scripts.atlasq:main',
         ]
     }
 )