diff --git a/doap.rdf.erb b/doap.rdf.erb
index 4e8c46e08c35eff0d731ae348895b12d5110d0ff..4c22c23cf30be6cc5c6d76a7c06b003fab7c9a59 100644
--- a/doap.rdf.erb
+++ b/doap.rdf.erb
@@ -77,8 +77,8 @@
     <doap:release>
       <doap:Version>
         <doap:branch>fox16</doap:branch>
-        <doap:created>@@DATE@@</doap:created>
-        <doap:revision>@@FXRUBY_VERSION@@</doap:revision>
+        <doap:created><%= Date.today %></doap:created>
+        <doap:revision><%= FXRUBY_VERSION %></doap:revision>
       </doap:Version>
     </doap:release>
 
diff --git a/pre-config.rb.erb b/pre-config.rb.erb
index dd9c276405355a53e7d2d49faaf7b317b0d75734..9bffd540f32c9cfd64ebe0cb919c9eabd82af9f2 100755
--- a/pre-config.rb.erb
+++ b/pre-config.rb.erb
@@ -88,14 +88,14 @@ end
 #
 
 instMajor, instMinor, instLevel = installed_fox_version().split('.')
-thisMajor, thisMinor, thisLevel = "@@FOX_VERSION@@".split('.')
+thisMajor, thisMinor, thisLevel = "<%= FOX_VERSION %>".split('.')
 
 expecting_stable_fox_release = ((thisMinor.to_i % 2) == 0)
 if expecting_stable_fox_release
   if (instMinor != thisMinor)
     puts ""
     puts "   ********************************************************"
-    puts "   * This version of FXRuby (@@FXRUBY_VERSION@@) must be built against"
+    puts "   * This version of FXRuby (<%= FXRUBY_VERSION %>) must be built against"
     puts "   * one of the stable releases of FOX, but it appears that"
     puts "   * you have a development version of FOX (version #{installed_fox_version})"
     puts "   * installed instead. Please download and install one of"
diff --git a/scripts/FXRuby.iss.erb b/scripts/FXRuby.iss.erb
index 9bbedf4055eabd5df2344ba03b83abd2f02cf3f4..e355bff6870241e521a7d8abad351753e0fd3201 100755
--- a/scripts/FXRuby.iss.erb
+++ b/scripts/FXRuby.iss.erb
@@ -3,17 +3,17 @@
 
 [Setup]
 AppName=FXRuby
-AppVerName=FXRuby @@FXRUBY_VERSION@@
-AppPublisherURL=@@FXRUBY_HOME_URL@@
-AppSupportURL=@@FXRUBY_HOME_URL@@
-AppUpdatesURL=@@FXRUBY_HOME_URL@@
+AppVerName=FXRuby <%= FXRUBY_VERSION %>
+AppPublisherURL=<%= FXRUBY_HOME_URL %>
+AppSupportURL=<%= FXRUBY_HOME_URL %>
+AppUpdatesURL=<%= FXRUBY_HOME_URL %>
 DefaultDirName=C:\ruby
 DefaultGroupName=FXRuby
 AllowNoIcons=no
 LicenseFile=LICENSE
 InfoBeforeFile=README.win32.txt
 OutputDir=.
-OutputBaseFilename=FXRuby-@@FXRUBY_VERSION@@-@@RUBYVER@@
+OutputBaseFilename=FXRuby-<%= FXRUBY_VERSION %>-<%= RUBYVER %>
 
 [Files]
 ; readme files
@@ -28,9 +28,9 @@ Source: "tests\README"; DestDir: "{app}\doc\FXRuby\tests"; Flags: ignoreversion
 Source: "tests\*.rb"; DestDir: "{app}\doc\FXRuby\tests"; Flags: ignoreversion
 Source: "tests\*.ps"; DestDir: "{app}\doc\FXRuby\tests"; Flags: ignoreversion
 ; main extension shared library
-Source: "ext\fox16\fox16.so"; DestDir: "{app}\lib\ruby\site_ruby\@@RUBY_VERSION@@\@@TARGET@@"; Flags: ignoreversion
+Source: "ext\fox16\fox16.so"; DestDir: "{app}\lib\ruby\site_ruby\<%= RUBY_VERSION %>\<%= TARGET %>; Flags: ignoreversion
 ; library files
-Source: "lib\fox16\*.rb"; DestDir: "{app}\lib\ruby\site_ruby\@@RUBY_VERSION@@\fox16"; Flags: ignoreversion
+Source: "lib\fox16\*.rb"; DestDir: "{app}\lib\ruby\site_ruby\<%= RUBY_VERSION %>\fox16"; Flags: ignoreversion
 ; samples
 Source: "examples\README"; DestDir: "{app}\samples\FXRuby"; Flags: ignoreversion
 Source: "examples\babelfish.rb"; DestDir: "{app}\samples\FXRuby"; DestName: "babelfish.rbw"; Flags: ignoreversion
diff --git a/scripts/make-installers.rb.erb b/scripts/make-installers.rb.erb
index e9858d1511b25b614ae54669eba44e4b119ada68..9c7b4ecc5346b4cecb6262a2b3457738156dfe8b 100755
--- a/scripts/make-installers.rb.erb
+++ b/scripts/make-installers.rb.erb
@@ -73,7 +73,7 @@ def do_upload(fxruby_version)
 end
 
 if __FILE__ == $0
-  fxruby_version = "@@FXRUBY_VERSION@@"
+  fxruby_version = "<%= FXRUBY_VERSION %>"
   untar(fxruby_version)
   iss_filename, dir = copy_installer_script(fxruby_version)
   Dir.chdir(dir)