diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index bfecd40..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Polls_2_0_2.zip
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..03f8290
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+Polls_2.1.0.zip
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 41c522c..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: zikula-module-Polls
-# $Id$
-NAME := zikula-module-Polls
-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/import.log b/import.log
deleted file mode 100644
index ee8ac5e..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-zikula-module-Polls-2_0_2-3_fc11:HEAD:zikula-module-Polls-2.0.2-3.fc11.src.rpm:1256252172
diff --git a/sources b/sources
index fea4f37..a44e06d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cad0cb9287ab06d935461b7e5fbbf939  Polls_2_0_2.zip
+ac66571295eca5934eb45d28e58af8aa  Polls_2.1.0.zip
diff --git a/zikula-module-Polls.spec b/zikula-module-Polls.spec
index eec5859..a4cbec0 100644
--- a/zikula-module-Polls.spec
+++ b/zikula-module-Polls.spec
@@ -3,19 +3,19 @@
 %global zikula_modname          Polls
 
 Name:           zikula-module-%{zikula_modname}
-Version:        2.0.2
-Release:        3%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Simple voting system for Zikula
 
 Group:          Applications/Publishing
 License:        GPL+
-URL:            http://code.zikula.org/advancedpolls/downloads
-# http://code.zikula.org/advancedpolls/downloads/3
-Source0:        %{zikula_modname}_2_0_2.zip
+URL:            http://code.zikula.org/advancedpolls
+# http://code.zikula.org/advancedpolls/downloads/4
+Source0:        http://code.zikula.org/advancedpolls/downloads/Polls_2.1.0.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 #BuildRequires:
-Requires:       zikula
+Requires:       zikula >= 1.2.2
 
 %description
 Polls is a simple voting system for the Zikula CMS system
@@ -38,7 +38,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__mkdir} -p $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname} 
 cp -pr . $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}
 rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/pndocs
-
+rm -rf $RPM_BUILD_ROOT/%{zikula_moddir}/%{zikula_modname}/locale
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,10 +47,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc pndocs/credits.txt
+#% doc locale/de/LC_MESSAGES/module_polls.mo
 %{zikula_moddir}/%{zikula_modname}
 
 
 %changelog
+* Wed May 05 2010 Eric "Sparks" Christensen <sparks@fedoraproject.org> - 2.1.0-1
+- gettext conversion #21
+- several category issues #33
+- template update
+- fixed several minor issues #15
+- fixed short url bugs #18
+
 * Thu Jul 23 2009 Eric "Sparks" Christensen <sparks@fedoraproject.org> - 2.0.2-3
 - Fixed SOURCE0 in SPEC