diff --git a/configure.ac b/configure.ac
index cebd6070..a7b2d9be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 #   moo/configure.ac
 #
 
-AC_INIT([medit],[0.9.4],[muntyan@tamu.edu],[medit])
+AC_INIT([medit],[0.9.5],[muntyan@tamu.edu],[medit])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
 
diff --git a/doc/help/app-license.html b/doc/help/app-license.html
index 7ea0ece0..42016244 100644
--- a/doc/help/app-license.html
+++ b/doc/help/app-license.html
@@ -12,7 +12,7 @@
 
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="prefs-file.html">Preferences files</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="gpl.html">GNU General Public License</a></td>
 </tr></table>
 <hr>
@@ -41,7 +41,7 @@ in medit, can be found in this section.
 <hr>
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="prefs-file.html">Preferences files</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="gpl.html">GNU General Public License</a></td>
 </tr></table>
 
diff --git a/doc/help/editing-options.html b/doc/help/editing-options.html
index c068d23d..e66439d0 100644
--- a/doc/help/editing-options.html
+++ b/doc/help/editing-options.html
@@ -82,6 +82,7 @@ The following options are available:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 medit tries to understand modelines of Vim, Emacs, and Kate text editors, so chances are it will correctly
 pick up the conventional settings from source files.
diff --git a/doc/help/index.html b/doc/help/index.html
index d83e9b11..60df47fc 100644
--- a/doc/help/index.html
+++ b/doc/help/index.html
@@ -3,24 +3,24 @@
 <HEAD>
 <META NAME="generator" CONTENT="http://txt2tags.sf.net">
 <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<TITLE>medit 0.9.4 Manual</TITLE>
+<TITLE>medit 0.9.5 Manual</TITLE>
 </HEAD>
 <BODY>
 
 <DIV CLASS="header" ID="header">
 
 
-<!--<div style="float:right;"><a href="/Users/muntyan/projects/moo/doc/medit.html">Print version</a>-->
+<!--<div style="float:right;"><a href="/home/muntyan/projects/moo/doc/medit.html">Print version</a>-->
 <!--<br><sup>(all sections in one long page)</sup></div>-->
 
-<H1>medit 0.9.4 Manual</H1>
+<H1>medit 0.9.5 Manual</H1>
 
 
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-medit 0.9.4 Manual
+medit 0.9.5 Manual
 </P>
 
 
diff --git a/doc/help/license-xdg-utils.html b/doc/help/license-xdg-utils.html
index ed74d421..1197b087 100644
--- a/doc/help/license-xdg-utils.html
+++ b/doc/help/license-xdg-utils.html
@@ -13,7 +13,7 @@
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="license-lua-lfs.html">LuaFileSystem License</a></td>
 	<td width="33%" align="center">Up: <a href="app-license.html">License</a></td>
-	<td width="33%" align="right">Next: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="right">Next: <a href="index.html">medit 0.9.5 Manual</a></td>
 </tr></table>
 <hr>
 
@@ -57,8 +57,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 </P>
 </DIV>
 
-<!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
-<!-- cmdline: txt2tags -\-outfile=/Users/muntyan/projects/moo/doc/medit.html /Users/muntyan/projects/moo/doc/medit.t2t -->
+<!-- html code generated by txt2tags 2.3 (http://txt2tags.sf.net) -->
+<!-- cmdline: txt2tags -\-outfile=/home/muntyan/projects/moo/doc/medit.html /home/muntyan/projects/moo/doc/medit.t2t -->
 
 
 <ul>
@@ -69,7 +69,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="license-lua-lfs.html">LuaFileSystem License</a></td>
 	<td width="33%" align="center">Up: <a href="app-license.html">License</a></td>
-	<td width="33%" align="right">Next: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="right">Next: <a href="index.html">medit 0.9.5 Manual</a></td>
 </tr></table>
 
 </BODY></HTML>
diff --git a/doc/help/prefs-file.html b/doc/help/prefs-file.html
index c51b6114..9a9f336f 100644
--- a/doc/help/prefs-file.html
+++ b/doc/help/prefs-file.html
@@ -12,7 +12,7 @@
 
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="user-tools-shell.html">Shell scripts</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="app-license.html">License</a></td>
 </tr></table>
 <hr>
@@ -63,7 +63,7 @@ Default value is "<CODE>%a - %f%s</CODE>" which produces something like "<CODE>m
 <hr>
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="user-tools-shell.html">Shell scripts</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="app-license.html">License</a></td>
 </tr></table>
 
diff --git a/doc/help/prefs-lang-options.html b/doc/help/prefs-lang-options.html
index 2f1c8dfa..177c838b 100644
--- a/doc/help/prefs-lang-options.html
+++ b/doc/help/prefs-lang-options.html
@@ -43,6 +43,7 @@ for which file patterns and mime types given language should be used.
 </TR>
 </TABLE>
 
+<P></P>
 
 
 
diff --git a/doc/help/prefs-langs-and-filters.html b/doc/help/prefs-langs-and-filters.html
index 5ab587f4..6a78321c 100644
--- a/doc/help/prefs-langs-and-filters.html
+++ b/doc/help/prefs-langs-and-filters.html
@@ -11,8 +11,8 @@
 
 
 <table width="100%"><tr valign="top">
-	<td width="33%" align="left">Previous: <a href="index.html">medit 0.9.4 Manual</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="left">Previous: <a href="index.html">medit 0.9.5 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="prefs-lang-options.html">Language-specific options</a></td>
 </tr></table>
 <hr>
@@ -39,8 +39,8 @@ for which the given language should be used.
 
 <hr>
 <table width="100%"><tr valign="top">
-	<td width="33%" align="left">Previous: <a href="index.html">medit 0.9.4 Manual</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="left">Previous: <a href="index.html">medit 0.9.5 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="prefs-lang-options.html">Language-specific options</a></td>
 </tr></table>
 
diff --git a/doc/help/prefs-user-tools.html b/doc/help/prefs-user-tools.html
index 5680de1b..077ad4a7 100644
--- a/doc/help/prefs-user-tools.html
+++ b/doc/help/prefs-user-tools.html
@@ -54,6 +54,7 @@ The following controls are available to modify the tools behavior:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 <I>Options</I> entry content is a comma-separated list of the following:
 </P>
@@ -76,6 +77,7 @@ The following controls are available to modify the tools behavior:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 <I>Files</I> entry content can be the following:
 </P>
@@ -114,6 +116,7 @@ Shell script tools also have the following controls available:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 <I>Output</I> entry specifies how the standard output of the command should be redirected.
 </P>
@@ -140,6 +143,7 @@ Shell script tools also have the following controls available:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 <I>Filter</I> combo. If the output pane is used, then it can be passed through a <I>filter</I>:
 the filter can match filenames and line numbers, so when you click the text in the
diff --git a/doc/help/sect-user-tools.html b/doc/help/sect-user-tools.html
index f1058209..6320def8 100644
--- a/doc/help/sect-user-tools.html
+++ b/doc/help/sect-user-tools.html
@@ -12,7 +12,7 @@
 
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="editing-options.html">Editing options</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="prefs-user-tools.html">Managing tools</a></td>
 </tr></table>
 <hr>
@@ -45,7 +45,7 @@ an example or to modify to suit your needs.
 <hr>
 <table width="100%"><tr valign="top">
 	<td width="33%" align="left">Previous: <a href="editing-options.html">Editing options</a></td>
-	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.4 Manual</a></td>
+	<td width="33%" align="center">Up: <a href="index.html">medit 0.9.5 Manual</a></td>
 	<td width="33%" align="right">Next: <a href="prefs-user-tools.html">Managing tools</a></td>
 </tr></table>
 
diff --git a/doc/help/user-tools-files.html b/doc/help/user-tools-files.html
index 51188a68..d04ec17b 100644
--- a/doc/help/user-tools-files.html
+++ b/doc/help/user-tools-files.html
@@ -87,6 +87,7 @@ the following format:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 In addition to these, you can set input and output options for executable files:
 </P>
@@ -105,6 +106,7 @@ In addition to these, you can set input and output options for executable files:
 </TR>
 </TABLE>
 
+<P></P>
 
 
 
diff --git a/doc/help/user-tools-python.html b/doc/help/user-tools-python.html
index d0ffbb19..70fe0a63 100644
--- a/doc/help/user-tools-python.html
+++ b/doc/help/user-tools-python.html
@@ -58,6 +58,7 @@ Python scripts have the following variables predefined:
 </TR>
 </TABLE>
 
+<P></P>
 
 
 
diff --git a/doc/help/user-tools-shell.html b/doc/help/user-tools-shell.html
index f5d26ab9..20df2147 100644
--- a/doc/help/user-tools-shell.html
+++ b/doc/help/user-tools-shell.html
@@ -55,6 +55,7 @@ The following environment variables are set when scripts are executed:
 </TR>
 </TABLE>
 
+<P></P>
 <P>
 Additionally, all processes ran from inside medit will have <CODE>DATADIR/scripts</CODE>
 directories in <CODE>$PATH</CODE>, so you may place some medit-specific programs
diff --git a/doc/medit.t2t b/doc/medit.t2t
index 2dcb6bca..38297444 100644
--- a/doc/medit.t2t
+++ b/doc/medit.t2t
@@ -8,7 +8,7 @@ APPNAME APPVERSION Manual
 
 %% 'entities'
 %! Postproc: APPNAME    medit
-%! Postproc: APPVERSION 0.9.4
+%! Postproc: APPVERSION 0.9.5
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%
diff --git a/medit/Makefile.ug b/medit/Makefile.ug
index a4229c04..6fbae8b7 100644
--- a/medit/Makefile.ug
+++ b/medit/Makefile.ug
@@ -69,9 +69,9 @@ endif
 
 bundle:
 	ige-mac-bundler $(srcdir)/mac/medit.bundle
-EXTRA_DIST +=		    \
-	mac/medit.bundle    \
-	mac/Info.plist	    \
-	mac/gtkrc	    \
-	mac/medit.icns	    \
+EXTRA_DIST +=			\
+	mac/medit.bundle	\
+	mac/Info.plist.in	\
+	mac/gtkrc		\
+	mac/medit.icns		\
 	mac/environment.sh
diff --git a/medit/mac/Info.plist b/medit/mac/Info.plist.in
similarity index 87%
rename from medit/mac/Info.plist
rename to medit/mac/Info.plist.in
index 3d808ff2..ac2f1867 100644
--- a/medit/mac/Info.plist
+++ b/medit/mac/Info.plist.in
@@ -7,7 +7,7 @@
     <key>CFBundleExecutable</key>
     <string>medit</string>
     <key>CFBundleGetInfoString</key>
-    <string>0.9.4, Copyright 2004-2008 Yevgen Muntyan</string>
+    <string>@MOO_VERSION_UNQUOTED@, Copyright 2004-2008 Yevgen Muntyan</string>
     <key>CFBundleIconFile</key>
     <string>medit.icns</string>
     <key>CFBundleIdentifier</key>
@@ -17,11 +17,11 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.9.4</string>
+    <string>@MOO_VERSION_UNQUOTED@</string>
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleVersion</key>
-    <string>0.9.4</string>
+    <string>@MOO_VERSION_UNQUOTED@</string>
     <key>NSHumanReadableCopyright</key>
     <string>Copyright 2004-2008 Yevgen Muntyan, GNU General Public License.</string>
     <key>LSMinimumSystemVersion</key>
