diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
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 27f2793..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 $$/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/sources b/sources
index e69de29..a44e06d 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+ac66571295eca5934eb45d28e58af8aa  Polls_2.1.0.zip
diff --git a/zikula-module-Polls.spec b/zikula-module-Polls.spec
new file mode 100644
index 0000000..a4cbec0
--- /dev/null
+++ b/zikula-module-Polls.spec
@@ -0,0 +1,69 @@
+%global zikula_base             %{_datadir}/zikula
+%global zikula_moddir           %{zikula_base}/modules
+%global zikula_modname          Polls
+
+Name:           zikula-module-%{zikula_modname}
+Version:        2.1.0
+Release:        1%{?dist}
+Summary:        Simple voting system for Zikula
+
+Group:          Applications/Publishing
+License:        GPL+
+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 >= 1.2.2
+
+%description
+Polls is a simple voting system for the Zikula CMS system
+
+
+%prep
+%setup -qn modules/%{zikula_modname}
+# Remove empty index.html and others
+find -size 0 | xargs rm -f
+
+
+%build
+# Fixing wrong-file-end-of-line-encoding errors
+cd pndocs
+sed -i 's/\r//' credits.txt
+
+
+%install
+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
+
+
+%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
+
+* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks@fedoraproject.org> - 2.0.2-2
+- Fixed wrong-file-end-of-line-encoding errors
+
+* Wed Jul 15 2009 Eric "Sparks" Christensen <sparks@fedoraproject.org> - 2.0.2-1
+- Initial RPM release