diff --git a/src/extension/Makefile.in b/src/extension/Makefile.in
index a702d5d..fc7af2a 100644
--- a/src/extension/Makefile.in
+++ b/src/extension/Makefile.in
@@ -82,7 +82,7 @@ $(OBJDBG)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(CFLAGS)	-fstack-check -DDEBUG=1 \
-						-DBUILD_DATE=`date +"0x%Y%m%d"`\
+						-DBUILD_DATE=`date +"%Y%m%d"`\
 						-g -o $@ -c $<
 
 $(OBJRLS)/%.o: \
@@ -92,7 +92,7 @@ $(OBJRLS)/%.o: \
 	@echo $< ...
 	@$(MKDIR) `dirname $@`
 	@$(CXX) $(CFLAGS)	-DNDEBUG=1 \
-						-DBUILD_DATE=`date +"0x%Y%m%d"` \
+						-DBUILD_DATE=`date +"%Y%m%d"` \
 						-o $@ -c $<
 
 #---[ Release Targets ]------------------------------------------------------------------
diff --git a/src/extension/rexx_methods.cc b/src/extension/rexx_methods.cc
index 0adca70..a7cd60f 100644
--- a/src/extension/rexx_methods.cc
+++ b/src/extension/rexx_methods.cc
@@ -90,7 +90,11 @@ RexxMethod1(RexxStringObject, rx3270_method_revision, CSELF, sessionPtr)
 	if(hSession)
 		return context->String((CSTRING) hSession->get_revision().c_str());
 
+#ifdef PACKAGE_REVISION
 	return context->String((CSTRING) PACKAGE_REVISION);
+#else
+	return context->String((CSTRING) STRINGIZE_VALUE_OF(BUILD_DATE));
+#endif
 }
 
 RexxMethod3(int, rx3270_method_connect, CSELF, sessionPtr, CSTRING, uri, OPTIONAL_int, wait)
diff --git a/src/extension/typed_routines.cc b/src/extension/typed_routines.cc
index e805b0c..43342b5 100644
--- a/src/extension/typed_routines.cc
+++ b/src/extension/typed_routines.cc
@@ -31,7 +31,7 @@
  #include <time.h>
  #include <string.h>
  #include <exception>
- #include <pw3270/class.h>
+ #include <pw3270cpp.h>
 
  using namespace std;
  using namespace PW3270_NAMESPACE;
--
libgit2 0.21.2