diff --git a/coredata.py b/coredata.py
index a8b336975..7ab3fb662 100644
--- a/coredata.py
+++ b/coredata.py
@@ -14,7 +14,7 @@
 
 import pickle, os, uuid
 
-version = '0.18.0-research'
+version = '0.18.0'
 
 # This class contains all data that must persist over multiple
 # invocations of Meson. It is roughly the same thing as
diff --git a/install_meson.py b/install_meson.py
index af736ae75..9afe5fcb2 100755
--- a/install_meson.py
+++ b/install_meson.py
@@ -20,7 +20,6 @@
 
 import os, sys, glob, shutil, gzip
 from optparse import OptionParser
-from coredata import version
 
 usage_info = '%prog [--prefix PREFIX] [--destdir DESTDIR]'
 
@@ -41,7 +40,7 @@ if options.destdir == '':
 else:
     install_root = os.path.join(options.destdir, options.prefix[1:])
 
-script_dir = os.path.join(install_root, 'share/meson-' + version)
+script_dir = os.path.join(install_root, 'share/meson')
 bin_dir = os.path.join(install_root, 'bin')
 bin_script = os.path.join(script_dir, 'meson.py')
 gui_script = os.path.join(script_dir, 'mesongui.py')
diff --git a/man/meson.1 b/man/meson.1
index f6953c2dc..54f10783f 100644
--- a/man/meson.1
+++ b/man/meson.1
@@ -1,4 +1,4 @@
-.TH MESON "1" "June 2014" "meson 0.17.0" "User Commands"
+.TH MESON "1" "July 2014" "meson 0.18.0" "User Commands"
 .SH NAME
 meson - a high productivity build system
 .SH DESCRIPTION
diff --git a/man/mesonconf.1 b/man/mesonconf.1
index 29ce1b4ff..6e2ddcffd 100644
--- a/man/mesonconf.1
+++ b/man/mesonconf.1
@@ -1,4 +1,4 @@
-.TH MESONCONF "1" "June 2014" "mesonconf 0.17.0" "User Commands"
+.TH MESONCONF "1" "July 2014" "mesonconf 0.18.0" "User Commands"
 .SH NAME
 mesonconf - a tool to configure Meson builds
 .SH DESCRIPTION
diff --git a/man/mesongui.1 b/man/mesongui.1
index f1a89c574..301220012 100644
--- a/man/mesongui.1
+++ b/man/mesongui.1
@@ -1,4 +1,4 @@
-.TH MESONGUI "1" "June 2014" "mesongui 0.17.0" "User Commands"
+.TH MESONGUI "1" "July 2014" "mesongui 0.18.0" "User Commands"
 .SH NAME
 mesongui - a gui for the Meson build system
 .SH DESCRIPTION