diff --git a/.cvsignore b/.cvsignore
index 20c48bb..15b8b7c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dialog-1.0-20060221.tgz
+dialog-1.1-20070227.tgz
diff --git a/dialog-1.1-20070227-incdir.patch b/dialog-1.1-20070227-incdir.patch
new file mode 100644
index 0000000..ab3f6ef
--- /dev/null
+++ b/dialog-1.1-20070227-incdir.patch
@@ -0,0 +1,23 @@
+--- dialog-1.1-20070227/dialog-config.in.incdir	2007-02-28 11:58:55.000000000 +0100
++++ dialog-1.1-20070227/dialog-config.in	2007-02-28 12:01:32.000000000 +0100
+@@ -35,7 +35,7 @@
+ libdir="@libdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+-
++includedir="@includedir@"
+ THIS="dialog"
+ 
+ test $# = 0 && exec @SHELL@ $0 --error
+@@ -67,10 +67,7 @@
+ 		;;
+ 	# compile/link
+ 	--cflags)
+-		INCS=
+-		if test "${prefix}/include" != /usr/include ; then
+-			INCS="-I${prefix}/include"
+-		fi
++		INCS="-I$includedir"
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+ 			$INCS
+ ENDECHO
diff --git a/dialog.spec b/dialog.spec
index a48a088..8004812 100644
--- a/dialog.spec
+++ b/dialog.spec
@@ -1,14 +1,15 @@
-Summary: A utility for creating TTY dialog boxes.
+Summary: A utility for creating TTY dialog boxes
 Name: dialog
-%define SubVersion 20060221
-Version: 1.0.%{SubVersion}
-Release: 1
+%define SubVersion 20070227
+Version: 1.1
+Release: 1.%{SubVersion}svn%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://invisible-island.net/dialog/dialog.html
-Source: ftp://invisible-island.net/dialog/dialog-1.0-%{SubVersion}.tgz
-BuildRoot: /var/tmp/dialog-root
-BuildPreReq: ncurses-devel, gettext
+Source: ftp://invisible-island.net/dialog/dialog-%{version}-%{SubVersion}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: ncurses-devel gettext findutils 
+Patch: dialog-1.1-20070227-incdir.patch
 
 %description
 Dialog is a utility that allows you to show dialog boxes (containing
@@ -19,19 +20,32 @@ gauge.
 
 Install dialog if you would like to create TTY dialog boxes.
 
+%package devel 
+Summary: Development files for building applications with the dialog library
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Dialog is a utility that allows you to show dialog boxes (containing
+questions or messages) in TTY (text mode) interfaces. This package 
+contains the files needed for developing applications, which use the 
+dialog library.
+
 %prep
-%setup -q -n dialog-1.0-%{SubVersion}
+%setup -q -n dialog-%{version}-%{SubVersion}
+%patch -p1 -b .incdir
 
 %build
-%configure --enable-nls --with-ncursesw
-make
+%configure --enable-nls --with-ncursesw --enable-shared --includedir=/usr/include/dialog
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 fgrep -l -r perl samples|xargs rm -f
+find samples -type f -print0 |xargs -0 chmod a-x
 
-%makeinstall
-rm -f 
+make install DESTDIR=$RPM_BUILD_ROOT
+make install-lib DESTDIR=$RPM_BUILD_ROOT 
 
 %find_lang %name
 
@@ -43,9 +57,23 @@ rm -rf $RPM_BUILD_ROOT
 %doc COPYING dialog.lsm README samples
 %{_prefix}/bin/dialog
 %{_mandir}/man1/dialog.*
+%{_mandir}/man3/dialog.*
 #%{_datadir}/locale/*/LC_MESSAGES/dialog.mo
 
+%files devel
+%defattr(-,root,root)
+%doc COPYING dialog.lsm README
+%{_prefix}/bin/dialog-config
+%{_includedir}/dialog
+%{_libdir}/libdialog.a
+
 %changelog
+* Wed Feb 28 2007 Harald Hoyer <harald@redhat.com> - 1.1-1.20070227svn%{?dist}
+- version 1.1-20070227
+- added devel subpackage
+- specfile fixes (bug#225693)
+- Resolves: rhbz#225693
+
 * Wed Jan 17 2007 Harald Hoyer <harald@redhat.com> - 1.0.20060221-1
 - version 1.0-20060221
 
diff --git a/sources b/sources
index 11fa766..b9be414 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acfd843163394e8bb17c841fdbe9c4a4  dialog-1.0-20060221.tgz
+95239c16108017837e9a06d5d2ed7c2c  dialog-1.1-20070227.tgz