diff --git a/Makefile.in b/Makefile.in
index 4cac813..fefa3b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,5 @@
-GUI_VERSION = @PACKAGE_VERSION@
-BASENAME = openvpn-gui-$(GUI_VERSION)
-EXE = @PACKAGE_NAME@.exe
+BASENAME = @PACKAGE_TARNAME@-@PACKAGE_VERSION@
+EXE = @PACKAGE_TARNAME@.exe
 
 CC = @CC@
 WINDRES = @WINDRES@
diff --git a/configure.ac b/configure.ac
index 4d2532d..e326867 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,22 @@
+
+define(MAJOR_VERSION,  1)
+define(MINOR_VERSION,  0)
+define(RELEASE,        3)
+
 AC_PREREQ([2.53])
-AC_INIT([openvpn-gui], [1.0.3], [openvpn-devel@lists.sourceforge.net])
+AC_INIT([OpenVPN GUI], [MAJOR_VERSION.MINOR_VERSION.RELEASE],
+	[openvpn-devel@lists.sourceforge.net], [openvpn-gui],
+	[http://openvpn-gui.sf.net])
 AC_CONFIG_SRCDIR([chartable.h])
 AC_CONFIG_HEADERS([config.h])
 
+AC_DEFINE(PACKAGE_MAJOR_VERSION, [MAJOR_VERSION],
+	[Define to the package major version.])
+AC_DEFINE(PACKAGE_MINOR_VERSION, [MINOR_VERSION],
+	[Define to the package minor version.])
+AC_DEFINE(PACKAGE_RELEASE, [RELEASE],
+	[Define to the package release number.])
+
 AC_PROG_CC_C99
 
 # Build Win32 native binaries
diff --git a/openvpn-gui-res.rc b/openvpn-gui-res.rc
index d7f1284..4491ab4 100644
--- a/openvpn-gui-res.rc
+++ b/openvpn-gui-res.rc
@@ -41,3 +41,29 @@ ID_ICO_DISCONNECTED  ICON  DISCARDABLE  "disconnected.ico"
 #include "openvpn-gui-res-no.rc"
 #include "openvpn-gui-res-pt.rc"
 #include "openvpn-gui-res-se.rc"
+
+/* Version information and such */
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION   PACKAGE_MAJOR_VERSION,PACKAGE_MINOR_VERSION,PACKAGE_RELEASE,0
+FILEOS        VOS_NT
+FILETYPE      VFT_APP
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904B0"  /* en_US, Unicode */
+        BEGIN
+            VALUE "FileDescription",  PACKAGE_NAME " for Windows"
+            VALUE "FileVersion",      PACKAGE_VERSION
+            VALUE "InternalName",     PACKAGE_TARNAME
+            VALUE "OriginalFilename", PACKAGE_TARNAME ".exe"
+            VALUE "ProductName",      PACKAGE_NAME
+            VALUE "ProductVersion",   PACKAGE_VERSION
+            VALUE "Website",          PACKAGE_URL
+            VALUE "LegalCopyright",   "The " PACKAGE_NAME " developers"
+            VALUE "CompanyName",      PACKAGE_NAME " is developed by these individuals:\r\n\r\n" \
+                                      "Mathias Sundman (retired)\r\n\r\n" \
+                                      "Heiko Hund\r\n" \
+                                      "<heikoh@users.sf.net>"
+        END
+    END
+END