diff --git a/configure.ac b/configure.ac
index 22e4e09..abb59a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,10 +85,6 @@ AC_SUBST(PACKAGE_REVISION,$app_cv_revision)
 AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
 AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
 
-AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`$PKG_CONFIG --variable=product_name ipc3270` ])
-AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
-AC_SUBST(PRODUCT_NAME,$app_cv_product)
-
 dnl ---------------------------------------------------------------------------
 dnl Check for OS specifics
 dnl ---------------------------------------------------------------------------
@@ -148,6 +144,10 @@ AC_PATH_TOOL([ZIP], [zip], [zip])
 
 PKG_CHECK_EXISTS
 
+AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`$PKG_CONFIG --variable=product_name lib3270` ])
+AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
+AC_SUBST(PRODUCT_NAME,$app_cv_product)
+
 dnl ---------------------------------------------------------------------------
 dnl Check for C++ 2011 support
 dnl ---------------------------------------------------------------------------
diff --git a/setup.py b/setup.py
index e54762b..e440524 100644
--- a/setup.py
+++ b/setup.py
@@ -18,10 +18,6 @@ if platform.system() == 'Windows':
 
 tn3270 = Extension(
 		'tn3270',
-		define_macros = [
-			('TN3270_MODULE_NAME', 'python3-tn3270'), 
-			('TN3270_MODULE_VERSION', '5.2')
-		],
 		include_dirs = include_dirs,
 		libraries = ['ipc3270'],
 		library_dirs=library_dirs,
@@ -57,6 +53,6 @@ setup ( name = 'tn3270',
 	long_description = '''
 This is an extension allowing tn3270 acess for python applications
 using lib3270 directly or ipc calls to an enabled pw3270 window.
-''',	
+''',
 	ext_modules = [ tn3270 ])
 
diff --git a/src/module/properties.cc b/src/module/properties.cc
index d3bc41a..8428686 100644
--- a/src/module/properties.cc
+++ b/src/module/properties.cc
@@ -33,20 +33,18 @@
 /*---[ Implement ]----------------------------------------------------------------------------------*/
 
 PyObject * py3270_get_module_version(PyObject *self, PyObject *args) {
-#if defined(TN3270_MODULE_VERSION)
-    return PyUnicode_FromString(LIB3270_STRINGIZE_VALUE_OF(TN3270_MODULE_VERSION));
-#elif defined(PACKAGE_VERSION)
+#if defined(PACKAGE_VERSION)
     return PyUnicode_FromString(PACKAGE_VERSION);
 #else
-    return PyUnicode_FromString("");
+    return PyUnicode_FromString(TN3270::getVersion());
 #endif // PACKAGE_VERSION
 }
 
 PyObject * py3270_get_module_revision(PyObject *self, PyObject *args) {
 #ifdef PACKAGE_REVISION
-    return PyLong_FromLong(PACKAGE_REVISION);
+    return PyUnicode_FromString(LIB3270_STRINGIZE_VALUE_OF(PACKAGE_REVISION));
 #else
-    return PyLong_FromLong(0);
+    return PyUnicode_FromString(TN3270::getRevision());
 #endif // PACKAGE_REVISION
 }
 
diff --git a/src/module/windows/init.cc b/src/module/windows/init.cc
index faa731b..3f3a6bd 100644
--- a/src/module/windows/init.cc
+++ b/src/module/windows/init.cc
@@ -82,7 +82,7 @@
     switch(dwcallpurpose) {
     case DLL_PROCESS_ATTACH:
         hModule = hInstance;
-        hEventLog = RegisterEventSource(NULL, LIB3270_STRINGIZE_VALUE_OF(PRODUCT_NAME));
+        hEventLog = RegisterEventSource(NULL, PACKAGE_NAME);
         break;
 
 	case DLL_PROCESS_DETACH:
--
libgit2 0.21.2