diff --git a/.cvsignore b/.cvsignore
index e2901f9..448d2c3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 hunspell-1.1.4.tar.gz
 hunspell-1.1.5.tar.gz
+hunspell-1.1.5-3.tar.gz
diff --git a/hunspell-1.1.4-defaultdictfromlang.patch b/hunspell-1.1.4-defaultdictfromlang.patch
index 335f051..f964ed0 100644
--- a/hunspell-1.1.4-defaultdictfromlang.patch
+++ b/hunspell-1.1.4-defaultdictfromlang.patch
@@ -1,6 +1,6 @@
 --- hunspell-1.1.4/src/tools/hunspell.cxx.orig	2006-11-29 12:09:52.000000000 +0000
 +++ hunspell-1.1.4/src/tools/hunspell.cxx	2006-11-29 12:24:36.000000000 +0000
-@@ -1105,7 +1105,20 @@
+@@ -1105,7 +1105,23 @@
          if (printgood && (filter_mode == NORMAL)) filter_mode = BADWORD;
  
  	if (! dicname) {
@@ -10,6 +10,7 @@
 +                                dicname = mystrdup("default");
 +                        }
 +                        else {
++			        dicname = mystrdup(dicname);
 +			        int len = strlen(dicname);
 +			        for (int i = 0; i < len; ++i) {
 +			            if ((dicname[i] == '_') && (i+3 < len)) {
@@ -19,6 +20,8 @@
 +                                }
 +                        }
 +                }
++                else
++                    dicname = mystrdup(dicname);
  	}
  
  	if (!privdicname) privdicname = mystrdup(getenv("WORDLIST"));
diff --git a/hunspell.spec b/hunspell.spec
index 17ab9ae..010e0ea 100644
--- a/hunspell.spec
+++ b/hunspell.spec
@@ -1,7 +1,7 @@
 Name:      hunspell
 Summary:   Hunspell is a spell checker and morphological analyzer library
-Version:   1.1.5
-Release:   2%{?dist}
+Version:   1.1.5.3
+Release:   1%{?dist}
 Source:    http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Group:     System Environment/Libraries
 URL:       http://hunspell.sourceforge.net/
@@ -10,8 +10,7 @@ License:   LGPL
 
 BuildRequires: libtool
 Patch0: hunspell-1.1.4-defaultdictfromlang.patch
-Patch1: hunspell-1.1.5-missingheaders.patch
-Patch2: hunspell-1.1.5-badheader.patch
+Patch1: hunspell-1.1.5-badheader.patch
 
 %description
 Hunspell is a spell checker and morphological analyzer library and program 
@@ -30,15 +29,14 @@ Includes and definitions for developing with hunspell
 %prep
 %setup -q
 %patch0 -p1 -b .defaultdictfromlang.patch
-%patch1 -p1 -b .missingheaders.patch
-%patch2 -p1 -b .badheader.patch
+%patch1 -p1 -b .badheader.patch
 
 %build
 libtoolize --automake --force
 aclocal -I m4
 autoconf
 automake
-%configure --disable-static
+%configure --disable-static  --with-ui --with-readline
 for i in man/*.? man/hu/*.?; do
     iconv -f ISO-8859-2 -t UTF-8 $i > $i.new
     mv -f $i.new $i
@@ -53,6 +51,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{_bindir}/example
 mkdir $RPM_BUILD_ROOT/%{_datadir}/myspell
+mv $RPM_BUILD_ROOT/%{_includedir}/*munch* $RPM_BUILD_ROOT/%{_includedir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/hunspell.pc
 
 %changelog
+* Mon May 21 2007 Caolan McNamara <caolanm@redhat.com> - 1.1.5.3-1
+- patchlevel release
+
 * Tue Mar 20 2007 Caolan McNamara <caolanm@redhat.com> - 1.1.5-2
 - some junk in delivered headers
 
diff --git a/sources b/sources
index 556d581..9082b0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c69950f7df9136e44a85390904445c45  hunspell-1.1.5.tar.gz
+9497cfb94c583c6717a2497c2495c561  hunspell-1.1.5-3.tar.gz