diff --git a/configure.in b/configure.in
index cfdfe23..d3e7cd2 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ done
 
 AM_INIT_AUTOMAKE($PACKAGENAME, $MAJOR.$MINOR.$LEAST, [marc@waeckerlin.org])
 
-AC_CONFIG_FILES([makefile proxyface/makefile
+AC_CONFIG_FILES([makefile proxyface/makefile proxyface/version.cxx
                  proxyface/libproxyface.pc debian/changelog])
 
 # programs
diff --git a/proxyface/makefile.am b/proxyface/makefile.am
index e6f37a1..9d2648c 100644
--- a/proxyface/makefile.am
+++ b/proxyface/makefile.am
@@ -1,5 +1,5 @@
-UISOURCES  = proxy.ui
-MOCHEADER  = proxy.hxx autoproxy.hxx
+UISOURCES  = proxy.ui proxyauth.ui
+MOCHEADER  = proxy.hxx autoproxy.hxx proxyauth.hxx
 LANGUAGES  = proxy_de.qm proxy_en.qm proxy_fr.qm proxy_it.qm
 LANG_TS = proxy_de.ts proxy_en.ts proxy_fr.ts proxy_it.ts
 
@@ -8,12 +8,12 @@ pkgconfig_DATA = libproxyface.pc
 pkgconfig2dir = $(datarootdir)/pkgconfig
 pkgconfig2_DATA = libproxyface.pc
 
-UIHEADER   = ui_proxy.hxx
-MOCSOURCES = moc_proxy.cxx moc_autoproxy.cxx
+UIHEADER   = ui_proxy.hxx ui_proxyauth.hxx
+MOCSOURCES = moc_proxy.cxx moc_autoproxy.cxx moc_proxyauth.cxx
 
-EXTRA_DIST = ${UISOURCES} $(pkgconfig_DATA).in
+EXTRA_DIST = ${UISOURCES} $(pkgconfig_DATA).in  version.cxx.in
 
-BUILT_SOURCES = ${UIHEADER} ${MOCSOURCES} ${LANGUAGES}
+BUILT_SOURCES = ${UIHEADER} ${MOCSOURCES} ${LANGUAGES} version.cxx
 
 proxyfacedir = ${includedir}/proxyface
 proxyface_HEADERS = unix.hxx windoze.hxx qtproxy.hxx \
@@ -21,7 +21,7 @@ proxyface_HEADERS = unix.hxx windoze.hxx qtproxy.hxx \
 
 lib_LTLIBRARIES = libproxyface.la
 
-libproxyface_la_SOURCES = ${MOCSOURCES} ${LANGUAGES}
+libproxyface_la_SOURCES = ${MOCSOURCES} ${LANGUAGES} version.cxx
 libproxyface_la_LIBADD = ${PROXYLIB}
 libproxyface_la_LDFLAGS = -version-info ${LIB_VERSION}
 
diff --git a/proxyface/version.cxx.in b/proxyface/version.cxx.in
new file mode 100644
index 0000000..f91daa8
--- /dev/null
+++ b/proxyface/version.cxx.in
@@ -0,0 +1,17 @@
+/*! @file
+
+    @id $Id$
+*/
+//       1         2         3         4         5         6         7         8
+// 45678901234567890123456789012345678901234567890123456789012345678901234567890
+
+
+#include <string>
+
+namespace proxy {
+  std::string version() {
+    return "@PACKAGENAME@-@VERSION@";
+  }
+  const std::string WHAT("#(@) @PACKAGENAME@-@VERSION@");
+  const std::string IDENT("$Id: @PACKAGENAME@-@VERSION@ $");
+}