diff --git a/.cvsignore b/.cvsignore
index 3f27d5f..bec4a8a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dwdiff-1.6.1.tgz
+dwdiff-1.7.tgz
diff --git a/dwdiff-localedir.patch b/dwdiff-localedir.patch
index 82cd27e..8575009 100644
--- a/dwdiff-localedir.patch
+++ b/dwdiff-localedir.patch
@@ -1,6 +1,6 @@
-diff -up dwdiff-1.6.1/configure.localedir dwdiff-1.6.1/configure
---- dwdiff-1.6.1/configure.localedir	2009-11-08 19:20:07.860603725 +0100
-+++ dwdiff-1.6.1/configure	2009-11-08 19:21:19.261351396 +0100
+diff -up ./configure.localedir ./configure
+--- ./configure.localedir	2010-03-07 21:30:36.700275112 +0100
++++ ./configure	2010-03-07 21:30:42.595276436 +0100
 @@ -148,6 +148,7 @@ create_makefile() {
  		replace_default prefix "${PREFIX}"
  		replace_default mandir "${MANDIR}"
@@ -19,15 +19,15 @@ diff -up dwdiff-1.6.1/configure.localedir dwdiff-1.6.1/configure
  		--mandir=*)
  			MANDIR=`echo "${PARAM}" | sed 's/^--mandir=//'`
  		;;
-diff -up dwdiff-1.6.1/Makefile.in.localedir dwdiff-1.6.1/Makefile.in
---- dwdiff-1.6.1/Makefile.in.localedir	2009-11-08 19:18:19.026350857 +0100
-+++ dwdiff-1.6.1/Makefile.in	2009-11-08 19:19:23.225349644 +0100
-@@ -75,7 +75,7 @@ dist-clean: clean
+diff -up ./Makefile.in.localedir ./Makefile.in
+--- ./Makefile.in.localedir	2010-03-07 21:29:05.009275664 +0100
++++ ./Makefile.in	2010-03-07 21:29:55.517570754 +0100
+@@ -81,7 +81,7 @@ dist-clean: clean
  	rm -rf dwdiff config.log Makefile
  
  .c.o:
--	$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $<
+-	$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DDWDIFF=\"$(bindir)/dwdiff\" -DLOCALEDIR=\"$(LOCALEDIR)\" $(ICUFLAGS) -c -o $@ $<
++	$(CC) $(CFLAGS) $(GETTEXTFLAGS) $(DIFF_FLAGS) -DDIFF=\"$(DIFF)\" -DDWDIFF=\"$(bindir)/dwdiff\" -DLOCALEDIR=\"$(BIND_DIR)\" $(ICUFLAGS) -c -o $@ $<
  
- dwdiff: $(OBJECTS)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS)
+ dwdiff: $(OBJECTS_DWDIFF)
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o dwdiff $(OBJECTS_DWDIFF) $(LDLIBS) $(ICULIBS) $(GETTEXTLIBS)
diff --git a/dwdiff.spec b/dwdiff.spec
index cfd8da4..59c7713 100644
--- a/dwdiff.spec
+++ b/dwdiff.spec
@@ -1,10 +1,10 @@
 Name:    dwdiff       
-Version: 1.6.1
+Version: 1.7
 Release: 1%{?dist}
 Summary: Front end to diff for comparing on a per word basis
 
 Group:   Applications/Text       
-License: OSL 2.0
+License: GPLv3
 URL:     http://os.ghalkes.nl/dwdiff.html
 Source0: http://os.ghalkes.nl/dist/%{name}-%{version}.tgz
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,6 +43,7 @@ rm -rf %{buildroot}%{_mandir}/nl.ISO8859-1/man1/
 rm -rf %{buildroot}%{_mandir}/nl.ISO8859-15/man1/
 mkdir %{buildroot}%{_mandir}/man1/nl/
 mv %{buildroot}%{_mandir}/nl.UTF-8/man1/dwdiff.1 %{buildroot}%{_mandir}/nl/man1/dwdiff.1
+mv %{buildroot}%{_mandir}/nl.UTF-8/man1/dwfilter.1 %{buildroot}%{_mandir}/nl/man1/dwfilter.1
 
 %clean
 rm -rf %{buildroot}
@@ -50,12 +51,18 @@ rm -rf %{buildroot}
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %{_bindir}/dwdiff
+%{_bindir}/dwfilter
 %doc README COPYING Changelog 
 %{_mandir}/man1/dwdiff.1*
+%{_mandir}/man1/dwfilter.1*
 
 %lang(nl) %{_mandir}/nl/man1/dwdiff.1*
+%lang(nl) %{_mandir}/nl/man1/dwfilter.1*
 
 %changelog
+* Sun Mar 7 2010 Jakub Hrozek <jhrozek@redhat.com> 1.7-1
+- New upstream release, changed license to GPLv3
+
 * Sun Nov 8 2009 Jakub Hrozek <jhrozek@redhat.com> 1.6.1-1
 - New upstream release
 
diff --git a/sources b/sources
index 214bbfa..e5262c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7bf94f579ce764c2070c17cc5a24332  dwdiff-1.6.1.tgz
+c88714707d755c5202a4a7fd74e815fd  dwdiff-1.7.tgz