diff --git a/gmp-FILE.diff b/gmp-FILE.diff
new file mode 100644
index 0000000..d73a5ce
--- /dev/null
+++ b/gmp-FILE.diff
@@ -0,0 +1,13 @@
+Index: gmp-h.in
+===================================================================
+--- gmp-h.in.orig	2006-04-11 20:10:15.000000000 +0200
++++ gmp-h.in	2007-05-23 11:08:11.000000000 +0200
+@@ -24,6 +24,7 @@ MA 02110-1301, USA. */
+ 
+ #if defined (__cplusplus)
+ #include <iosfwd>   /* for std::istream, std::ostream, std::string */
++#include <cstdio>   /* for std::FILE */
+ #endif
+ 
+ 
+
diff --git a/gmp.changes b/gmp.changes
index eead5cc..5819d4b 100644
--- a/gmp.changes
+++ b/gmp.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan  3 10:38:28 CET 2008 - rguenther@suse.de
+
+- Fix std::FILE usage for C++ again.
+- Move info postin to the correct sub-package.
+
 -------------------------------------------------------------------
 Wed Dec 12 14:28:23 CET 2007 - rguenther@suse.de
 
diff --git a/gmp.spec b/gmp.spec
index 8429518..8c3b54a 100644
--- a/gmp.spec
+++ b/gmp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package gmp (Version 4.2.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,17 +12,18 @@
 
 Name:           gmp
 BuildRequires:  gcc-c++
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v3 or later; LGPL v3 or later
 Group:          System/Libraries
 AutoReqProv:    on
 Version:        4.2.2
-Release:        1
+Release:        3
 Summary:        The GNU MP Library
 Url:            http://gmplib.org/
 Source:         gmp-%{version}.tar.bz2
 Patch0:         gmp-noexec.diff
 Patch1:         gmp-ia64.diff
 Patch2:         gmp-s390x.diff
+Patch3:         gmp-FILE.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -56,6 +57,7 @@ Authors:
 %patch0
 %patch1
 %patch2
+%patch3
 
 %build
 export HOME=/tmp/
@@ -78,7 +80,16 @@ CFLAGS="$RPM_OPT_FLAGS -Wall" \
             --build=%{_target_platform} \
 	    --disable-mpfr \
             --enable-cxx
+#%ifarch x86_64
+#make CFLAGS="$RPM_OPT_FLAGS -Wall" fib_table.h mp_bases.h
+#cd mpf
+#make CFLAGS="$RPM_OPT_FLAGS -fno-cse-follow-jumps -Wall" cmp_si.o cmp_si.lo
+#cd ..
+#%endif
 make CFLAGS="$RPM_OPT_FLAGS -Wall" CC=gcc %{?jobs:-j%jobs}
+#%ifnarch alpha
+#make CFLAGS="$RPM_OPT_FLAGS -Wall" CC=gcc check %{?jobs:-j%jobs}
+#%endif
 
 %check
 # do not disable "make check", FIX THE BUGS!
@@ -92,6 +103,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/libgmpxx.a
 
 %post
 %run_ldconfig
+
+%post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
 %postun
@@ -120,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 /usr/include/gmpxx.h
 
 %changelog
+* Thu Jan 03 2008 - rguenther@suse.de
+- Fix std::FILE usage for C++ again.
+- Move info postin to the correct sub-package.
 * Wed Dec 12 2007 - rguenther@suse.de
 - Update to 4.2.2, which is now LGPLv3.
 - Remove no longer applicable patches.