diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj
index 8e77c219c3..06ca524382 100644
--- a/BizHawk.Emulation/BizHawk.Emulation.csproj
+++ b/BizHawk.Emulation/BizHawk.Emulation.csproj
@@ -246,6 +246,7 @@
     <Compile Include="Interfaces\Base Implementations\NullController.cs" />
     <Compile Include="Interfaces\Base Implementations\NullEmulator.cs" />
     <Compile Include="Interfaces\CoreComms.cs" />
+    <Compile Include="Properties\svnrev.cs" />
     <Compile Include="QuickCollections.cs" />
     <Compile Include="Sound\CDAudio.cs" />
     <Compile Include="Sound\Utilities\BufferedAsync.cs" />
@@ -314,6 +315,9 @@
     <Folder Include="Consoles\PSX\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/BizHawk.Emulation/Properties/AssemblyInfo.cs b/BizHawk.Emulation/Properties/AssemblyInfo.cs
index 4f418bc55b..744fba8ae1 100644
--- a/BizHawk.Emulation/Properties/AssemblyInfo.cs
+++ b/BizHawk.Emulation/Properties/AssemblyInfo.cs
@@ -6,13 +6,8 @@ using System.Runtime.InteropServices;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("BizHawk.Emulation")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("BizHawk.Emulation")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyDescription("http://code.google.com/p/bizhawk")]
+[assembly: AssemblyCompany("BizHawk")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -32,5 +27,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.0.0." + SubWCRev.SVN_REV)]
+[assembly: AssemblyFileVersion("1.0.0." + SubWCRev.SVN_REV)]
diff --git a/BizHawk.Emulation/Properties/svnrev_template b/BizHawk.Emulation/Properties/svnrev_template
new file mode 100644
index 0000000000..31c5a95c9c
--- /dev/null
+++ b/BizHawk.Emulation/Properties/svnrev_template
@@ -0,0 +1,4 @@
+static class SubWCRev
+{
+	public const string SVN_REV = "$WCREV$";
+}
diff --git a/DiscoHawk/About.Designer.cs b/DiscoHawk/About.Designer.cs
index 7a99b7f16c..6f045e31b5 100644
--- a/DiscoHawk/About.Designer.cs
+++ b/DiscoHawk/About.Designer.cs
@@ -31,6 +31,7 @@
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(About));
 			this.richTextBox1 = new System.Windows.Forms.RichTextBox();
 			this.button1 = new System.Windows.Forms.Button();
+			this.lblVersion = new System.Windows.Forms.Label();
 			this.SuspendLayout();
 			// 
 			// richTextBox1
@@ -38,7 +39,7 @@
 			this.richTextBox1.Location = new System.Drawing.Point(12, 12);
 			this.richTextBox1.Name = "richTextBox1";
 			this.richTextBox1.ReadOnly = true;
-			this.richTextBox1.Size = new System.Drawing.Size(499, 272);
+			this.richTextBox1.Size = new System.Drawing.Size(499, 236);
 			this.richTextBox1.TabIndex = 1;
 			this.richTextBox1.Text = resources.GetString("richTextBox1.Text");
 			this.richTextBox1.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.richTextBox1_LinkClicked);
@@ -46,21 +47,31 @@
 			// button1
 			// 
 			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.Location = new System.Drawing.Point(436, 290);
+			this.button1.Location = new System.Drawing.Point(436, 254);
 			this.button1.Name = "button1";
 			this.button1.Size = new System.Drawing.Size(75, 23);
 			this.button1.TabIndex = 2;
 			this.button1.Text = "OK";
 			this.button1.UseVisualStyleBackColor = true;
 			// 
+			// lblVersion
+			// 
+			this.lblVersion.AutoSize = true;
+			this.lblVersion.Location = new System.Drawing.Point(12, 259);
+			this.lblVersion.Name = "lblVersion";
+			this.lblVersion.Size = new System.Drawing.Size(79, 13);
+			this.lblVersion.TabIndex = 3;
+			this.lblVersion.Text = "version number";
+			// 
 			// About
 			// 
 			this.AcceptButton = this.button1;
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 			this.CancelButton = this.button1;
-			this.ClientSize = new System.Drawing.Size(525, 323);
+			this.ClientSize = new System.Drawing.Size(525, 282);
 			this.ControlBox = false;
+			this.Controls.Add(this.lblVersion);
 			this.Controls.Add(this.button1);
 			this.Controls.Add(this.richTextBox1);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
@@ -68,6 +79,7 @@
 			this.Name = "About";
 			this.Text = "About DiscoHawk";
 			this.ResumeLayout(false);
+			this.PerformLayout();
 
 		}
 
@@ -75,5 +87,6 @@
 
 		private System.Windows.Forms.RichTextBox richTextBox1;
 		private System.Windows.Forms.Button button1;
+		private System.Windows.Forms.Label lblVersion;
 	}
 }
\ No newline at end of file
diff --git a/DiscoHawk/About.cs b/DiscoHawk/About.cs
index 6025f6d4b4..35f410a4c4 100644
--- a/DiscoHawk/About.cs
+++ b/DiscoHawk/About.cs
@@ -14,6 +14,7 @@ namespace BizHawk
 		public About()
 		{
 			InitializeComponent();
+			lblVersion.Text = "v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString() + " beta";
 		}
 
 		private void richTextBox1_LinkClicked(object sender, LinkClickedEventArgs e)
diff --git a/DiscoHawk/About.resx b/DiscoHawk/About.resx
index 03ea4eceea..c9bd99d438 100644
--- a/DiscoHawk/About.resx
+++ b/DiscoHawk/About.resx
@@ -126,7 +126,6 @@ BizHawk is a .net-based multi-system emulator brought to you by some of the rere
 
 To use, drag a .cue into the MAGIC area. DiscoHawk will dump a newly cleaned up cue+bin pair to the same directory as the original .cue, and call it _hawked.
 
-This is beta software. You are invited to report problems to our bug tracker or IRC. Problems consist of: crusty disc images that crash DiscoHawk or that cause DiscoHawk to produce a _hawked.cue which fails to serve your particular purposes (which we will need to be informed of, in case we are outputting wrongly.)
-</value>
+This is beta software. You are invited to report problems to our bug tracker or IRC. Problems consist of: crusty disc images that crash DiscoHawk or that cause DiscoHawk to produce a _hawked.cue which fails to serve your particular purposes (which we will need to be informed of, in case we are outputting wrongly.)</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/DiscoHawk/DiscoHawk.csproj b/DiscoHawk/DiscoHawk.csproj
index 7f0404d225..a8b91d4766 100644
--- a/DiscoHawk/DiscoHawk.csproj
+++ b/DiscoHawk/DiscoHawk.csproj
@@ -100,6 +100,8 @@
     <Compile Include="ProgressDialog.Designer.cs">
       <DependentUpon>ProgressDialog.cs</DependentUpon>
     </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\svnrev.cs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -151,4 +153,7 @@
   <ItemGroup>
     <Content Include="discohawk.ico" />
   </ItemGroup>
+  <PropertyGroup>
+    <PreBuildEvent>"$(SolutionDir)subwcrev.bat" "$(ProjectDir)"</PreBuildEvent>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/DiscoHawk/Properties/AssemblyInfo.cs b/DiscoHawk/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..e672c96780
--- /dev/null
+++ b/DiscoHawk/Properties/AssemblyInfo.cs
@@ -0,0 +1,31 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DiscoHawk")]
+[assembly: AssemblyDescription("http://code.google.com/p/bizhawk")]
+[assembly: AssemblyCompany("BizHawk")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("0DE267F2-039C-44A3-8489-97A4D99649C2")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0." + SubWCRev.SVN_REV)]
+[assembly: AssemblyFileVersion("1.0.0." + SubWCRev.SVN_REV)]
diff --git a/DiscoHawk/Properties/svnrev_template b/DiscoHawk/Properties/svnrev_template
new file mode 100644
index 0000000000..31c5a95c9c
--- /dev/null
+++ b/DiscoHawk/Properties/svnrev_template
@@ -0,0 +1,4 @@
+static class SubWCRev
+{
+	public const string SVN_REV = "$WCREV$";
+}
diff --git a/SubWCRev.bat b/SubWCRev.bat
new file mode 100644
index 0000000000..b559bc81a7
--- /dev/null
+++ b/SubWCRev.bat
@@ -0,0 +1 @@
+"%~1..\SubWCRev.exe" "%~1\.." "%~1properties\svnrev_template" "%~1properties\svnrev.cs"
diff --git a/SubWCRev.exe b/SubWCRev.exe
new file mode 100644
index 0000000000..50524069b6
Binary files /dev/null and b/SubWCRev.exe differ