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 df512e7..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: afflib
-# $Id$
-NAME := afflib
-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 $$/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/afflib-3.2.1-fix_namespace.patch b/afflib-3.2.1-fix_namespace.patch
new file mode 100644
index 0000000..9af1354
--- /dev/null
+++ b/afflib-3.2.1-fix_namespace.patch
@@ -0,0 +1,12 @@
+diff -up afflib-3.2.1/lib/afflib_i.h.fix_namespace afflib-3.2.1/lib/afflib_i.h
+--- afflib-3.2.1/lib/afflib_i.h.fix_namespace	2008-06-25 11:01:34.000000000 +0200
++++ afflib-3.2.1/lib/afflib_i.h	2008-06-25 11:01:51.000000000 +0200
+@@ -340,7 +340,7 @@ typedef struct _AFFILE {
+     void	*vnodeprivate;	      // private storage for the vnode
+     void	(*error_reporter)(const char *fmt, ...);
+     struct af_crypto *crypto;		
+-} AFFILE;
++};
+ 
+ 
+ 
diff --git a/afflib.spec b/afflib.spec
index 57a6cc2..3fc7c29 100644
--- a/afflib.spec
+++ b/afflib.spec
@@ -1,6 +1,6 @@
 Name:           afflib
 Version:        3.1.6
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Library to support the Advanced Forensic Format
 
 Group:          System Environment/Libraries
@@ -10,6 +10,7 @@ Source0:        http://www.afflib.org/downloads/afflib-%{version}.tar.gz
 Patch0:         afflib-3.0.1-WCtype.patch
 Patch1:         afflib-3.1.3-gcc43.patch
 Patch3:         afflib-3.1.3-ldconfig.patch
+Patch4:         afflib-3.2.1-fix_namespace.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libtool
@@ -126,6 +127,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jun 26 2008 kwizart < kwizart at gmail.com > - 3.1.6-3
+- bump
+
+* Wed Jun 25 2008 kwizart < kwizart at gmail.com > - 3.1.6-2
+- backport Fix redefinition of typedef AFFILE
+
 * Tue Apr 15 2008 kwizart < kwizart at gmail.com > - 3.1.6-1
 - Update to 3.1.6