diff --git a/CHANGES.rst b/CHANGES.rst
index 57af4627..53ad7801 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -8,6 +8,10 @@ v0.7.1
 ======
 - Updated requirements on upstream packages
 
+v0.6.12
+=======
+- Fixed bug with quantities.constants when used with Arrhenius class
+
 v0.6.11
 =======
 - Fixed an issue with PuLP under FreeBSD (gh-109)
diff --git a/setup.py b/setup.py
index a1a20ddc..92af2542 100755
--- a/setup.py
+++ b/setup.py
@@ -18,15 +18,6 @@
 
 RELEASE_VERSION = os.environ.get('%s_RELEASE_VERSION' % pkg_name.upper(), '')  # v*
 
-# http://conda.pydata.org/docs/build.html#environment-variables-set-during-the-build-process
-if os.environ.get('CONDA_BUILD', '0') == '1':
-    try:
-        RELEASE_VERSION = 'v' + io.open(
-            '__conda_version__.txt', 'rt', encoding='utf-8'
-        ).readline().rstrip()
-    except IOError:
-        pass
-
 
 def _path_under_setup(*args):
     return os.path.join(os.path.dirname(__file__), *args)
@@ -52,7 +43,9 @@ def _path_under_setup(*args):
         else:
             if 'develop' not in sys.argv:
                 warnings.warn("Using git to derive version: dev-branches may compete.")
-                __version__ = re.sub('v([0-9.]+)-(\d+)-(\w+)', r'\1.post\2+\3', _git_version)  # .dev < '' < .post
+                _ver_tmplt = r'\1.post\2' if os.environ.get('CONDA_BUILD', '0') == '1' else r'\1.post\2+\3'
+                __version__ = re.sub('v([0-9.]+)-(\d+)-(\S+)', _ver_tmplt, _git_version)  # .dev < '' < .post
+
 
 submodules = [
     'chempy.electrochemistry',