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..5e56379
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+wxdfast_0.6.0.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5e61e27..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wxdfast
-# $Id$
-NAME := wxdfast
-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..1e8b549 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+05c2a71cc8f811d1ad5916fce29b7b3a  wxdfast_0.6.0.tar.gz
diff --git a/wxdfast-autotools.patch b/wxdfast-autotools.patch
new file mode 100644
index 0000000..94f183f
--- /dev/null
+++ b/wxdfast-autotools.patch
@@ -0,0 +1,37 @@
+--- src/Makefile.am.orig	2007-08-22 10:22:18.000000000 +0200
++++ src/Makefile.am	2007-08-22 10:22:35.000000000 +0200
+@@ -17,11 +17,9 @@
+ PORTABLE_FLAGS = -D WXDFAST_PORTABLE
+ endif
+ 
+-CFLAGS =\
+-	 -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
++CFLAGS += $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
+ 
+-CXXFLAGS =\
+-	 -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
++CXXFLAGS += $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
+ 
+ wxdfast_SOURCES = \
+ 	BoxFind.cpp\
+--- src/Makefile.in.orig	2007-08-22 10:24:23.000000000 +0200
++++ src/Makefile.in	2007-08-22 10:27:03.000000000 +0200
+@@ -112,16 +112,14 @@
+ AWK = @AWK@
+ CC = @CC@
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = \
+-	 -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
++CFLAGS = @CFLAGS@ $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
+ 
+ CPP = @CPP@
+ CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
+ CXXCPP = @CXXCPP@
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = \
+-	 -Wall -O2 $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
++CXXFLAGS = @CXXFLAGS@ $(DEBUG_FLAGS) $(XRC_FLAGS) $(PORTABLE_FLAGS)
+ 
+ CYGPATH_W = @CYGPATH_W@
+ DEBUG_FALSE = @DEBUG_FALSE@
diff --git a/wxdfast.spec b/wxdfast.spec
new file mode 100644
index 0000000..1e47cae
--- /dev/null
+++ b/wxdfast.spec
@@ -0,0 +1,71 @@
+Name: wxdfast
+Version: 0.6.0        
+Release: 3%{?dist}
+Summary: Multi-threaded download manager        
+
+Group: Applications/Internet        
+License: GPLv2
+URL: http://dfast.sourceforge.net/            
+Source0: http://prdownloads.sourceforge.net/sourceforge/dfast/%{name}_%{version}.tar.gz       
+Patch0: wxdfast-autotools.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: wxGTK-devel
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+
+%description
+wxDownload Fast (also known as wxDFast) is an open source multi-threaded
+download manager.This means that it can split a file into several pieces
+and download the pieces simultaneously
+
+%prep
+%setup -q
+%patch0
+
+find . -name '*.cpp' -exec chmod a-x {} ';'
+find . -name '*.h' -exec chmod a-x {} ';'
+
+%build
+%configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+
+desktop-file-install --vendor fedora       \
+  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+$RPM_BUILD_ROOT%{_datadir}/applications/wxdfast.desktop
+
+chmod -x COPYING README AUTHORS ChangeLog
+
+%find_lang wxDFast
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files -f wxDFast.lang
+%defattr(-,root,root,-)
+%{_bindir}/wxdfast
+%{_datadir}/wxdfast
+%{_mandir}/man1/wxdfast.1.gz
+%{_mandir}/pt_BR/man1/wxdfast.1.gz
+%{_datadir}/pixmaps/wxdfast.png
+%{_datadir}/applications/fedora-wxdfast.desktop
+%doc COPYING README AUTHORS ChangeLog
+
+
+
+%changelog
+* Thu Aug 23 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.6.0-3
+- Fix source file permissions
+
+* Wed Aug 22 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.6.0-2
+- Add patches and specfile changes from Dan Horak (RH #249524)
+
+* Wed Jul 25 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.6.0-1
+- Initital Build