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..43fc7af
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wput-0.6.1.tgz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1cdcd47..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wput
-# $Id$
-NAME := wput
-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..76a92fd 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+92b41efed4db8eb4f3443c23bf7ceecf  wput-0.6.1.tgz
diff --git a/wput-destdir.patch b/wput-destdir.patch
new file mode 100644
index 0000000..5324920
--- /dev/null
+++ b/wput-destdir.patch
@@ -0,0 +1,14 @@
+diff -ruN wput-0.6.1.orig/Makefile.in wput-0.6.1.new/Makefile.in
+--- wput-0.6.1.orig/Makefile.in	2007-12-12 15:30:04.000000000 -0200
++++ wput-0.6.1.new/Makefile.in	2008-10-26 20:09:36.000000000 -0200
+@@ -16,8 +16,8 @@
+ 
+ install: all
+ 	cd po && $(MAKE) $(MAKEDEFS) $@
+-	install -m0755 wput $(bindir)
+-	install -m0644 doc/wput.1.gz $(mandir)
++	install -D -p -m 0755 wput $(DESTDIR)$(bindir)/wput
++	install -D -p -m 0644 doc/wput.1.gz $(DESTDIR)$(mandir)/wput.1.gz
+ 	@echo "----------------"
+ 	@echo "Wput installed. See 'wput -h' or 'man wput' for usage information."
+ 	@echo "Further documentation is located in the doc/USAGE.* files."
diff --git a/wput.spec b/wput.spec
new file mode 100644
index 0000000..91ae714
--- /dev/null
+++ b/wput.spec
@@ -0,0 +1,56 @@
+Summary: A utility for uploading files or whole directories to remote ftp-servers
+Name: wput
+Version: 0.6.1
+Release: 4%{?dist}
+License: GPLv2+
+Group: Applications/Internet
+URL: http://wput.sourceforge.net/
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Patch0: wput-destdir.patch
+BuildRequires: gettext
+BuildRequires: gnutls-devel
+
+%description
+Wput is a command-line ftp-client that looks like wget but instead of
+downloading, uploads files or whole directories to remote ftp-servers.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%configure --disable-g-switch
+
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%find_lang %{name}
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc ChangeLog COPYING INSTALL TODO doc
+%{_mandir}/man1/*
+%{_bindir}/%{name}
+
+%changelog
+
+* Mon Oct 28 2008 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.6.1-4
+- Changes bugzilla #468633 Comment #10 From Manuel Wolfshant ->
+- BuildRequires: gettext / gnutls-devel
+
+* Thu Oct 27 2008 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.6.1-3
+- Start counting patches from 0 / Rename Patch1 to Patch0
+- Fix Source0 Address
+
+* Mon Oct 27 2008 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.6.1-2
+- Changes bugzilla #468633 Comment #1 From Fabian Affolter ->
+- Fix Release, %%files section and consistent use of macros
+
+* Thu Oct 26 2008 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.6.1-1.0
+- Initial package.
\ No newline at end of file