diff --git a/.gitignore b/.gitignore
index 1492f77..e174f7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 dvtm-0.5.2.tar.gz
+/dvtm-0.7.tar.gz
diff --git a/dvtm.spec b/dvtm.spec
index 6ac1203..eebbf58 100644
--- a/dvtm.spec
+++ b/dvtm.spec
@@ -1,15 +1,12 @@
 Name:           dvtm
-Version:        0.5.2
-Release:        1%{?dist}
+Version:        0.7
+Release:        3%{?dist}
 Summary:        Tiling window management for the console
-
 Group:          Applications/System
-License:        MIT and LGPLv2
+License:        MIT and ISC
 URL:            http://www.brain-dump.org/projects/%{name}/
 Source0:        http://www.brain-dump.org/projects/%{name}/%{name}-%{version}.tar.gz
-Patch0:         Makefile-%{version}.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch0:         Makefile-0.5.2.patch
 BuildRequires:  ncurses-devel
 
 %description
@@ -22,30 +19,34 @@ programs like vim, mutt, cmus or irssi.
 %setup -q
 %patch0 -p1 -b .Makefile
 
-
 %build
 sed -i 's/PREFIX.*local*/PREFIX\ =\ \/usr\//' config.mk
-CFLAGS=`echo $RPM_OPT_FLAGS` make %{?_smp_mflags}
-
+CFLAGS="%{optflags}" make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+make install DESTDIR=%{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE README
 %{_bindir}/%{name}
 %{_bindir}/%{name}-status
 %{_mandir}/man1/%{name}.1*
 
-
 %changelog
+* Tue Jan 24 2012 Adam Miller <maxamillion@fedoraproject.org> - 0.7-3
+- Update to 0.7 for EPEL
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Sep 05 2011 Petr Sabata <contyk@redhat.com> - 0.7-1
+- Update to 0.7
+- Change license of the terminal component to ISC
+- Drop now obsolete BuildRoot and defattr
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Aug 06 2009 Rakesh Pandit <rakesh@fedoraproject.org> - 0.5.2-1
 - Updated to 0.5.2
 
diff --git a/sources b/sources
index 0f4deaa..b509021 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7872b9e61705a4e9952655b3b88e4add  dvtm-0.5.2.tar.gz
+d8ef63bad5b48324ad040630c51a1c26  dvtm-0.7.tar.gz