diff --git a/.cvsignore b/.cvsignore
index 2334e20..02a27a3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ctapi-cyberjack-2.0.14.tar.gz
+ctapi-cyberjack-3.0.0.tar.gz
diff --git a/ctapi-cyberjack.spec b/ctapi-cyberjack.spec
index 0b261a8..1e0a10a 100644
--- a/ctapi-cyberjack.spec
+++ b/ctapi-cyberjack.spec
@@ -1,18 +1,19 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
-Version:	2.0.14
+Version:	3.0.0
 Release:	1%{?dist}
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
 
 BuildRequires:  libusb-devel readline-devel pcsc-lite-devel >= 1.3.0
 
-URL:		http://downloads.sourceforge.net/libchipcard/ctapi-cyberjack-2.0.14b1.tar.gz
+URL:		http://mesh.dl.sourceforge.net/sourceforge/libchipcard/ctapi-cyberjack-%{version}.tar.gz		
 
 License: 	LGPL
 Group: 		Development/Libraries
 Source0: 	%{name}-%{version}.tar.gz
 Source1:	91-cyberjack.rules
+Source2:	ctapi.h
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define readers_dir %(pkg-config libpcsclite --variable=usbdropdir)
@@ -29,6 +30,11 @@ Requires:	pcsc-lite
 Group:          Development/Libraries
 Provides:	pcsc-ifd-handler
 
+%package tools
+Summary:	Some tools for the reader
+Requires:	%{name} = %{version}
+Group:		Applications/System
+
 %description
 REINER SCT cyberJack pinpad/e-com USB user space driver
 
@@ -59,6 +65,11 @@ Development files for libctapi-cyberjack
 %description pcsc
 Files for the PC/SC system.
 
+%description tools
+The tool's for read the german Geldkarte, flash the firmware
+and an generic check tool for the reader.
+
+
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -73,8 +84,6 @@ make DESTDIR=$RPM_BUILD_ROOT install
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/ctapi
 mkdir -p $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack
 mv $RPM_BUILD_ROOT%{_libdir}/libctapi-cyberjack* $RPM_BUILD_ROOT%{_libdir}/ctapi/
-#fix for missing file
-install -c -m 644 ctapi/include/ctapi.h $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h 
 # fix for crash when no X server running
 	mv $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf.default  $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf
 	sed -i "s\flags=0\flags=0x10000\1" $RPM_BUILD_ROOT%{_sysconfdir}/cyberjack.conf
@@ -83,6 +92,10 @@ rm -f $RPM_BUILD_ROOT/sbin/udev.cyberjack.sh
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/99-cyberjack.rules
 #use my own udev file, because the orginal is more forSuSE 
 install -c -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/91-cyberjack.rules
+# add the header, because the orginal was removed
+install -c -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_includedir}/ctapi-cyberjack/ctapi.h 
+#move the helper script to /usr/bin
+mv $RPM_BUILD_ROOT%{_libdir}/cyberjack/getdist.sh $RPM_BUILD_ROOT%{_bindir}/
 
 %post pcsc
 #register PC/SC driver  and restart daemon
@@ -108,8 +121,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 # CT-API
 %{_libdir}/ctapi/libctapi-cyberjack.so.*
-%{_bindir}/cjgeldkarte
-%{_bindir}/ctsh
 %config %{_sysconfdir}/cyberjack.conf
 %config %{_sysconfdir}/udev/rules.d/91-cyberjack.rules
 
@@ -124,12 +135,31 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(0644,root,root)
-%dir %{_includedir}/ctapi-cyberjack
+%attr(0755,root,root)%dir %{_includedir}/ctapi-cyberjack
 %{_includedir}/ctapi-cyberjack/ctapi.h
 %{_libdir}/ctapi/libctapi-cyberjack.so
 %{_libdir}/ctapi/libctapi-cyberjack.la
 
+%files tools
+%defattr(0755,root,root)
+%{_bindir}/cjgeldkarte
+%{_bindir}/cjflash
+%{_bindir}/cyberjack
+%{_bindir}/getdist.sh
+
 %changelog
+* Sat Jun 23 2007 Frank Büttner <frank-buettner@gmx.net> - 3.0.0-1%{?dist}
+ - final release for 3.0.0
+
+* Thu  May 31 2007 Frank Büttner <frank-buettner@gmx.net> - 3.0.0beta1-2%{?dist}
+- rebuild with the missing file
+
+* Thu May 08 2007 Frank Büttner <frank-buettner@gmx.net> - 3.0.0beta1-1%{?dist}
+- first build for the new version
+
+* Fri May 04 2007 Frank Büttner <frank-buettner@gmx.net> - 2.0.14-2%{?dist}
+- rebuild for the ppc64 arch
+
 * Sat Apr 07 2007 Frank Büttner <frank-buettner@gmx.net> - 2.0.14-1%{?dist}
 - update to release of 2.0.14
 - fix unowned directores
diff --git a/sources b/sources
index a20138b..bdfe5ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21f244b849205dcabdcb90cb1eebb4ff  ctapi-cyberjack-2.0.14.tar.gz
+5100e348cefb36d5cac3ff8dabd17d4c  ctapi-cyberjack-3.0.0.tar.gz