diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 1982f70..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-vidalia-0.1.12.tar.gz
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8cc6952
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vidalia-0.1.15.tar.gz
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 5d97a3b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: vidalia
-# $Id$
-NAME := vidalia
-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/import.log b/import.log
deleted file mode 100644
index 96eb508..0000000
--- a/import.log
+++ /dev/null
@@ -1 +0,0 @@
-vidalia-0_1_12-1_fc11:HEAD:vidalia-0.1.12-1.fc11.src.rpm:1241020214
diff --git a/sources b/sources
index a6e153f..5942a6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5820043228e7303fa4bee714bd839804  vidalia-0.1.12.tar.gz
+005afad126dc6142d7748ec185d9fafe  vidalia-0.1.15.tar.gz
diff --git a/vidalia.spec b/vidalia.spec
index b8be530..c09c93e 100644
--- a/vidalia.spec
+++ b/vidalia.spec
@@ -1,6 +1,6 @@
 Name:             vidalia
-Version:          0.1.12
-Release:          1%{?dist}
+Version:          0.1.15
+Release:          2%{?dist}
 Summary:          GUI controller for the Tor Onion Routing Network
 
 Group:            Applications/Internet
@@ -43,7 +43,14 @@ Doxygen generated documentations for %{name}.
 
 
 %build
+%if 0%{?_qt4_bindir:1}
+PATH=%{_qt4_bindir}:$PATH; export PATH
+%else
+PATH=%{_libdir}/qt4/bin:$PATH; export PATH
+%endif
+
 %cmake .
+
 make %{?_smp_mflags}
 
 cd doc
@@ -63,6 +70,9 @@ install -Dpm0644 doc/%{name}.1 \
         %{buildroot}%{_mandir}/man1/%{name}.1
 
 desktop-file-install \
+        %if 0%{?rhel}
+        --vendor="" \
+        %endif
         --dir %{buildroot}%{_datadir}/applications \
         %{SOURCE1}
 
@@ -105,6 +115,28 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Sep 02 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.15-2
+- Rebuild for epel
+
+* Wed Sep 02 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.15-1
+- New upstream release
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.1.14-3
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 07 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.14-1
+- New upstream release
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.13-2
+- Merge builds for fedora and epel
+
+* Mon Jun 01 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.13-1
+- Update to 0.1.13
+- Adjust to fedora and epel
+
 * Sun Apr 06 2009 Simon Wesp <cassmodiah@fedoraproject.org> - 0.1.12-1
 - New upstream release
 - Correct typo in URL