diff --git a/gprolog-1.3.0-linedit.patch b/gprolog-1.3.0-linedit.patch
new file mode 100644
index 0000000..c3450a3
--- /dev/null
+++ b/gprolog-1.3.0-linedit.patch
@@ -0,0 +1,17 @@
+--- gprolog-1.3.0.orig/src/Linedit/Makefile.in	2007-01-04 23:21:50.000000000 +1300
++++ gprolog-1.3.0/src/Linedit/Makefile.in	2007-03-04 08:33:37.000000000 +1300
+@@ -11,9 +11,14 @@
+ .SUFFIXES:
+ .SUFFIXES: @OBJ_SUFFIX@ .c $(SUFFIXES)
+ 
++all: $(LIBNAME)
++
+ .c@OBJ_SUFFIX@:
+ 	$(CC) -c $(CFLAGS) $*.c
+ 
++linedit.o: linedit.c
++	$(CC) -c $^
++
+ $(LIBNAME): $(OBJLIB)
+ 	rm -f $(LIBNAME)
+ 	$(AR_RC)@AR_SEP@$(LIBNAME) $(OBJLIB)
diff --git a/gprolog-1.3.0-test.patch b/gprolog-1.3.0-test.patch
new file mode 100644
index 0000000..3270b52
--- /dev/null
+++ b/gprolog-1.3.0-test.patch
@@ -0,0 +1,12 @@
+diff -up gprolog-1.3.0/src/Ma2Asm/chkma.c.tst gprolog-1.3.0/src/Ma2Asm/chkma.c
+--- gprolog-1.3.0/src/Ma2Asm/chkma.c.tst	2008-06-15 21:40:34.000000000 +0200
++++ gprolog-1.3.0/src/Ma2Asm/chkma.c	2008-06-15 21:42:38.000000000 +0200
+@@ -227,7 +227,7 @@ main(int argc, char *argv[])
+   printf("check running without FC (NO fast call)\n");
+ #endif
+ 
+-#elif !defined(FC_USED_TO_COMPILE_CORE)
++#elif !defined(FC_USED_TO_COMPILE_CORE) && defined(FAST)
+ 
+ #error FAST defined but cannot compile for FC
+ 
diff --git a/gprolog.spec b/gprolog.spec
index 8b7934e..8b54977 100644
--- a/gprolog.spec
+++ b/gprolog.spec
@@ -1,16 +1,18 @@
 Name:           gprolog
 Version:	1.3.0
-Release:	15%{?dist}
+Release:	16%{?dist}
 Summary: 	GNU Prolog is a free Prolog compiler
 
 Group: 		Development/Languages
 License:	GPLv2
 URL: 		http://www.gprolog.org
 Source: 	http://www.gprolog.org/gprolog-%{version}.tar.gz
+Patch1:		gprolog-1.3.0-test.patch
+Patch2:		gprolog-1.3.0-linedit.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch:	%{ix86} ppc alpha
+ExclusiveArch:	x86_64 %{ix86} ppc alpha
 
 %description 
 GNU Prolog is a native Prolog compiler with constraint solving over
@@ -50,32 +52,36 @@ Documentation for GNU Prolog.
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 
 %build
 cd src
 
 # gprolog only acccept -O0 and don't like -fomit-frame-pointer
 
-#CFLG="$(echo $RPM_OPT_FLAGS | sed -e "s/\-O2/-O0/" | \
-#                            sed -e "s/\-fomit-frame-pointer//")"
+CFLG="$(echo $RPM_OPT_FLAGS | sed -s "s/\-O2/-O1/g" \
+	     		    | sed -e "s/\-fomit-frame-pointer//")"
+
+# Based on a gentoo ebuild (??)
+CFLG="$CFLG -funsigned-char"
 
-CFLG=$RPM_OPT_FLAGS
 # sed -i -e "s:TXT_FILES      = @TXT_FILES@:TXT_FILES=:" Makefile.in
 ./configure \
        --with-install-dir=$RPM_BUILD_ROOT%{_libdir}/gprolog-%{version} \
        --without-links-dir --without-examples-dir \
        --with-doc-dir=dist-doc \
-       --with-c-flags="$RPM_OPT_FLAGS"
+      --with-c-flags="$CFLG"
 
 # _smp_flags seems to make trouble
 make TRAILSZ=16000 GLOBALSZ=32000
 
-# %check
-# cd src
+%check
+cd src
 #
-# export PATH=$RPM_BUILD_ROOT%{_bindir}:$PATH
+export PATH=$RPM_BUILD_ROOT%{_bindir}:$PATH
 #
-# make check
+make check
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -124,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jun 15 2008 Jochen Schmitt <Jochen herr-schmitt de> - 1.3.0-16
+- Fix FTBFS (#440495)
+
 * Wed Apr  9 2008 Jochen Schmitt <Jochen herr-schmitt de> - 1.3.0-15
 - Exclude x86_64 because a build failure (#440945)