diff --git a/irssi.spec.in b/irssi.spec.in
index 98b6c625..c0ed2a9b 100644
--- a/irssi.spec.in
+++ b/irssi.spec.in
@@ -1,27 +1,25 @@
-# $Revision: 1.13 $, $Date: 2002/05/01 22:52:51 $
+# $Revision: 1.14 $, $Date: 2003/11/17 20:43:05 $
 Name: 		irssi
 Version: 	@VERSION@
 Release: 	1
 Vendor: 	Timo Sirainen <cras@irssi.org>
 Summary:  	Irssi is a IRC client
-Copyright: 	GPL
+License: 	GPL
 Group: 		Applications/Communications
-URL: 		http://irssi.org/
-Source0: 	http://irssi.org/irssi/files/%{name}-%{version}.tar.gz
-BuildRequires:	glib-devel
-BuildRequires:	ncurses-devel
-BuildRoot: 	/tmp/%{name}-%{version}-root
+URL: 		http://www.irssi.org/
+Source0: 	http://www.irssi.org/files/%{name}-%{version}.tar.gz
+BuildRequires:  glib-devel >= 1.2.0, ncurses-devel
+BuildRoot:      /tmp/%{name}-%{version}-root
 
 %define		_sysconfdir	/etc
 %define		configure { CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; ./configure %{_target_platform} 	--prefix=%{_prefix} --exec-prefix=%{_exec_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} }
 
 %description
-Irssi is a modular IRC client that currently has only text
-mode user interface, but 80-90% of the code isn't text mode specific
-so other UI could be created pretty easily. Also, Irssi isn't really
-even IRC specific anymore, there's already a working SILC module
-available. Support for other protocols like ICQ could be create some day
-too.
+Irssi is a modular IRC client that currently has only text mode user
+interface, but 80-90% of the code isn't text mode specific so other UI
+could be created pretty easily. Also, Irssi isn't really even IRC
+specific anymore, there's already a working SILC module available.
+Support for other protocols like ICQ could be created some day too.
 
 More information can be found at http://irssi.org/.
 
@@ -29,45 +27,48 @@ More information can be found at http://irssi.org/.
 %setup -q
 
 %build
-export NOCONFIGURE=x
-./autogen.sh       
 %configure \
-	--with-imlib \
+	--with-plugins \
 	--enable-ipv6 \
 	--with-textui \
+	--with-imlib \
+	--with-bot \
 	--with-socks \
-        --with-bot \
-        --with-proxy \
-        --with-perl=yes \
+	--with-proxy \
+	--with-perl="yes" \
 	--with-ncurses
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT PREFIX=$RPM_BUILD_ROOT/usr install
-mv $RPM_BUILD_ROOT/%{_datadir}/doc/irssi $RPM_BUILD_ROOT/%{_datadir}/doc/irssi-%version
-strip $RPM_BUILD_ROOT/%{_bindir}/*
-strip $RPM_BUILD_ROOT/%{_libdir}/irssi/modules/lib*.so*
-rm -f $RPM_BUILD_ROOT/%{_libdir}/perl5/5.6.0/i386-linux/perllocal.pod
+rm -rf ${RPM_BUILD_ROOT}
+make DESTDIR=${RPM_BUILD_ROOT} PREFIX=${RPM_BUILD_ROOT}%{_prefix} PERL_INSTALL_ROOT=${RPM_BUILD_ROOT} install
+strip ${RPM_BUILD_ROOT}%{_bindir}/*
+strip ${RPM_BUILD_ROOT}%{_libdir}/irssi/modules/lib*.so*
+
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/irssi/modules/*.{a,la} \
+	${RPM_BUILD_ROOT}%{perl_archlib}/auto/Irssi/.packlist \
+	${RPM_BUILD_ROOT}%{perl_archlib}/auto/Irssi/*/.packlist \
+	${RPM_BUILD_ROOT}%{perl_archlib}/perllocal.pod
+rm -rf ${RPM_BUILD_ROOT}%{_docdir}/irssi/
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf ${RPM_BUILD_ROOT}
+rm -rf ${RPM_BUILD_DIR}/%{name}-%{version}
 
 %files 
-%defattr (644,root,root,755)
-%doc %{_datadir}/doc/irssi-%version/
-
-%attr(755,root,root) %{_bindir}/*
-
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/irssi*
-
-%dir %{_libdir}
-%attr(755,root,root) %{_libdir}/irssi
-%attr(755,root,root) %{_libdir}/perl5
-
-%dir %{_datadir}/irssi
-%attr(755,root,root) %{_datadir}/irssi/*
+%defattr(-, root, root, 0755)
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
+%doc docs/*.txt docs/*.html
+%doc %{_mandir}/man1/*
+%config(noreplace) %{_sysconfdir}/*
+%{_bindir}/*
+%{_libdir}/irssi/
+%{perl_archlib}
+%{_datadir}/irssi/
 
 %changelog
+* Mon Nov 17 2003 Robert Scheck <irssi@robert-scheck.de>
+  Fixed many things for better rebuilding and a good package
+
 * Fri Aug 17 2001 - Joose Vettenranta <joose@iki.fi>
   Created new spec file from spec file founded in irssi-0.7.98.3