diff --git a/.conda/post-link.sh b/.conda/post-link.sh
new file mode 100755
index 0000000000000000000000000000000000000000..af4ace98972a59cca1f2a4c0d46ea10883e96d26
--- /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 atlasq imcp immv imglob"
+for script in $scripts; do
+    if [ -f ${FSLDIR}/bin/${script} ]; then rm ${FSLDIR}/bin/${script}; fi
+    ln -s ${PREFIX}/bin/${script} ${FSLDIR}/bin/${script}
+done
+
diff --git a/.conda/pre-unlink.sh b/.conda/pre-unlink.sh
new file mode 100755
index 0000000000000000000000000000000000000000..fa79dac5240a78d3184c3873bab50bf2957487ba
--- /dev/null
+++ b/.conda/pre-unlink.sh
@@ -0,0 +1,5 @@
+if [ -z ${FSLDIR} ]; then exit; fi
+scripts="atlasquery atlasq imcp immv imglob"
+for script in $scripts; do
+    if [ -f ${FSLDIR}/bin/${script} ]; then rm ${FSLDIR}/bin/${script}; fi
+done
diff --git a/fsl/scripts/atlasq.py b/fsl/scripts/atlasq.py
index 486e2c02a719cb93cfe5729285d24e743565a190..13aa820504d4a58dd73dccdda5e0bcaa2bb5d58e 100644
--- a/fsl/scripts/atlasq.py
+++ b/fsl/scripts/atlasq.py
@@ -737,6 +737,15 @@ def main(args=None):
 
     return 0
 
+def atlasquery_emulation(args=None):
+    """Entry point for ``atlasquery``. Runs as ``atlasq`` in ``ohi`` 
+    mode.
+    """
+    
+    if args is None:
+        args=sys.argv[1:]
+        
+    return main(['ohi']+args)
 
 if __name__ == '__main__':
     sys.exit(main())
diff --git a/setup.py b/setup.py
index e9fa4e65851f5a7a4b43fe3aa1559ee9534c846c..020890ba56c2caf065a5b002bf4781daf06315d5 100644
--- a/setup.py
+++ b/setup.py
@@ -127,7 +127,8 @@ setup(
             'immv   = fsl.scripts.immv:main',
             'imcp   = fsl.scripts.imcp:main',
             'imglob = fsl.scripts.imglob:main',
-            'atlasq = fsl.scripts.atlasq:main',
+            'atlasq  = fsl.scripts.atlasq:main',
+            'atlasquery = fsl.scripts.atlasq:atlasquery_emulation',
         ]
     }
 )