diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 4e715a9..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: activemq-cpp
-# $Id$
-NAME := activemq-cpp
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/activemq-cpp.spec b/activemq-cpp.spec
index 9328f98..1d0e047 100644
--- a/activemq-cpp.spec
+++ b/activemq-cpp.spec
@@ -1,5 +1,5 @@
 Name:           activemq-cpp
-Version:        3.1.0
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        C++ implementation of JMS-like messaging client
 
@@ -130,21 +130,29 @@ make %{?_smp_mflags} check
 %doc doc/%{name}.pdf
 
 %changelog
+* Fri Apr 3 2010 Steve Traylen <steve.traylen@cern.ch> - 3.1.2-1
+- Upstream to 3.1.2
+
 * Tue Jan 9 2010 Steve Traylen <steve.traylen@cern.ch> - 3.1.0-1
 - Upstream to 3.1.0
 
 * Fri Dec 11 2009 Steve Traylen <steve.traylen@cern.ch> - 3.0.1-1
 - Upstream to 3.0.1
 - Tar ball name change.
+
 * Fri Dec 11 2009 Steve Traylen <steve.traylen@cern.ch> - 2.2.6-5
 - Add libuuid-devel as Requires to -devel package.
+
 * Sat Nov 14 2009 Steve Traylen <steve.traylen@cern.ch> - 2.2.6-4
 - Remove patch to relocate headers from versioned directory.
 - Add make smp options to make check.
+
 * Fri Nov 6 2009 Steve Traylen <steve.traylen@cern.ch> - 2.2.6-3
 - Relocate headers to non versioned directory with patch0
+
 * Fri Nov 6 2009 Steve Traylen <steve.traylen@cern.ch> - 2.2.6-2
 - Adapted to Fedora guidelines.
+
 * Thu Feb 26 2009 Ricardo Rocha <ricardo.rocha@cern.ch> - 2.2.6-1
 - First version of the spec file
 
diff --git a/import.log b/import.log
deleted file mode 100644
index 0975c89..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-activemq-cpp-2_2_6-5_fc13:HEAD:activemq-cpp-2.2.6-5.fc13.src.rpm:1260816471
diff --git a/sources b/sources
index 9a01de9..4a6e463 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a501bd7a12bb3db8931df3bf2012c8d6  activemq-cpp-library-3.1.0-src.tar.gz
+a553210201d97a9ff76762bdfe548c29  activemq-cpp-library-3.1.2-src.tar.gz