diff --git a/link-with-pthread.patch b/link-with-pthread.patch
new file mode 100644
index 0000000..c8aefc7
--- /dev/null
+++ b/link-with-pthread.patch
@@ -0,0 +1,35 @@
+Otherwise we get this link error:
+  CXXLD  stap-serverd
+.../ld: stap_serverd-stap-serverd.o: undefined reference to symbol 'sem_getvalue@@GLIBC_2.2.5'
+.../ld: note: 'sem_getvalue@@GLIBC_2.2.5' is defined in DSO /lib64/libpthread.so.0 so try adding it to the linker command line
+/lib64/libpthread.so.0: could not read symbols: Invalid operation
+collect2: error: ld returned 1 exit status
+
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ Makefile.am |    2 +-
+ Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -184,7 +184,7 @@ stap_serverd_SOURCES = stap-serverd.cxx
+ stap_serverd_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ $(nss_CFLAGS)
+ stap_serverd_CFLAGS = $(AM_CFLAGS) @PIECFLAGS@ $(nss_CFLAGS)
+ stap_serverd_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@
+-stap_serverd_LDADD = $(nss_LIBS)
++stap_serverd_LDADD = $(nss_LIBS) -lpthread
+ if HAVE_AVAHI
+ stap_serverd_CFLAGS += $(avahi_CFLAGS)
+ stap_serverd_CXXFLAGS += $(avahi_CFLAGS)
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -504,7 +504,7 @@ PHONIES = $(am__append_17) $(am__append_
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	$(nss_CFLAGS) \
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	$(am__append_24)
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_LDFLAGS = $(AM_LDFLAGS) @PIELDFLAGS@
+-@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_LDADD = $(nss_LIBS) \
++@BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_serverd_LDADD = $(nss_LIBS) -lpthread \
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@	$(am__append_26)
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_SOURCES = stap-gen-cert.cxx util.cxx nsscommon.cxx
+ @BUILD_SERVER_TRUE@@BUILD_TRANSLATOR_TRUE@@HAVE_NSS_TRUE@stap_gen_cert_CXXFLAGS = $(AM_CXXFLAGS) @PIECXXFLAGS@ $(nss_CFLAGS)
diff --git a/systemtap-1.7.tar.bz2 b/systemtap-1.7.tar.bz2
deleted file mode 100644
index 9062ac2..0000000
--- a/systemtap-1.7.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f05c60410e4d73e21f6a22aa70f1c26283254e8634378aedbb7e39b58196df7d
-size 1891921
diff --git a/systemtap-1.8.tar.gz b/systemtap-1.8.tar.gz
new file mode 100644
index 0000000..2faa216
--- /dev/null
+++ b/systemtap-1.8.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9061962818ff27a2557487195984a72f45bb90f0076d088b71e055cd8434b3b0
+size 2414738
diff --git a/systemtap-automake112.patch b/systemtap-automake112.patch
deleted file mode 100644
index 40b40a1..0000000
--- a/systemtap-automake112.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 5b2bc70bd7db920c50b90cea554ca93a02cdf0b2 Mon Sep 17 00:00:00 2001
-From: Nitin A Kamble <nitin.a.kamble@intel.com>
-Date: Tue, 8 May 2012 14:13:49 -0400
-Subject: [PATCH] configury: automake 1.12 as deprecated automatic de-ANSI-fication support
-
-Fix this issue with automake 1.12:
-
-| configure.ac:23: error: automatic de-ANSI-fication support has been removed
-
-[fche:] Note that the systemtap git repository and source releases include
-autoconf- and automake-generated files, so this is only an issue for those
-who have an unusual reason to regenerate them.
-
-Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
----
- configure    |   39 ---------------------------------------
- configure.ac |    1 -
- 2 files changed, 0 insertions(+), 40 deletions(-)
-
-diff --git a/configure b/configure
-index a6cd57c..89291f3 100755
---- a/configure
-+++ b/configure
-@@ -682,8 +682,6 @@ MSGFMT
- GETTEXT_MACRO_VERSION
- USE_NLS
- RANLIB
--ANSI2KNR
--U
- am__fastdepCXX_FALSE
- am__fastdepCXX_TRUE
- CXXDEPMODE
-@@ -6449,43 +6447,6 @@ if test "$am_t" != yes; then
- fi
- 
- 
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for function prototypes" >&5
--$as_echo_n "checking for function prototypes... " >&6; }
--if test "$ac_cv_prog_cc_c89" != no; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--$as_echo "yes" >&6; }
--
--$as_echo "#define PROTOTYPES 1" >>confdefs.h
--
--
--$as_echo "#define __PROTOTYPES 1" >>confdefs.h
--
--else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
--if test "$ac_cv_prog_cc_stdc" != no; then
--  U= ANSI2KNR=
--else
--  U=_ ANSI2KNR=./ansi2knr
--fi
--# Ensure some checks needed by ansi2knr itself.
--
--for ac_header in string.h
--do :
--  ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
--if test "x$ac_cv_header_string_h" = xyes; then :
--  cat >>confdefs.h <<_ACEOF
--#define HAVE_STRING_H 1
--_ACEOF
--
--fi
--
--done
--
--
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-diff --git a/configure.ac b/configure.ac
-index 51d3960..93450d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,6 @@ AC_PROG_CXX
- AC_PROG_CPP
- AM_PROG_CC_STDC
- AM_PROG_CC_C_O
--AM_C_PROTOTYPES
- AC_PROG_RANLIB
- AC_OBJEXT
- AC_EXEEXT
--- 
-1.7.3.4
-
-
diff --git a/systemtap-docs.changes b/systemtap-docs.changes
index 9d0dc32..9c3d920 100644
--- a/systemtap-docs.changes
+++ b/systemtap-docs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jun 18 09:47:49 CEST 2012 - jslaby@suse.de
+
+- Upgrade to version 1.8
+
 -------------------------------------------------------------------
 Thu Jun 14 20:11:49 UTC 2012 - dimstar@opensuse.org
 
diff --git a/systemtap-docs.spec b/systemtap-docs.spec
index ff9256c..a7c6f68 100644
--- a/systemtap-docs.spec
+++ b/systemtap-docs.spec
@@ -26,18 +26,17 @@ BuildRequires:  pkg-config
 BuildRequires:  fop
 BuildRequires:  latex2html
 BuildRequires:  xmlto
-Version:        1.7
+Version:        1.8
 Release:        0
 Summary:        Documents and examples for systemtap
 License:        GPL-2.0+
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
-Source:         systemtap-%{version}.tar.bz2
+Source:         http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source2:        README-BEFORE-ADDING-PATCHES
 Patch1:         systemtap-docdir-fix.diff
 Patch2:         systemtap-xmlto-fop.diff
 Patch3:         systemtap-docs-autoconf-version.diff
-Patch4:         systemtap-automake112.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -50,7 +49,6 @@ This package contains the documents and examples for systemtap.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 # fix interpreter
diff --git a/systemtap-xmlto-fop.diff b/systemtap-xmlto-fop.diff
index e544cdf..0c980e4 100644
--- a/systemtap-xmlto-fop.diff
+++ b/systemtap-xmlto-fop.diff
@@ -4,12 +4,12 @@
 
 --- a/doc/SystemTap_Tapset_Reference/Makefile.am
 +++ b/doc/SystemTap_Tapset_Reference/Makefile.am
-@@ -43,7 +43,9 @@ stamp-htmldocs: tapsets.xml
+@@ -56,7 +56,9 @@ stamp-htmldocs: tapsets.xml
  
  # bump up the allocated space so "xmlto pdf" works
  tapsets.pdf: tapsets.xml
--	env pool_size=3000000 hash_extra=3000000 xmlto $(XMLTOPDFPARAMS) pdf tapsets.xml >/dev/null 2>&1
-+#	env pool_size=3000000 hash_extra=3000000 xmlto $(XMLTOPDFPARAMS) pdf tapsets.xml >/dev/null 2>&1
+-	env pool_size=6000000 hash_extra=6000000 xmlto $(XMLTOPDF_FOP) $(XMLTOPDFPARAMS) pdf tapsets.xml >/dev/null 2>&1
++#	env pool_size=6000000 hash_extra=6000000 xmlto $(XMLTOPDF_FOP) $(XMLTOPDFPARAMS) pdf tapsets.xml >/dev/null 2>&1
 +	xmlto fo tapsets.xml
 +	fop tapsets.fo tapsets.pdf
  
diff --git a/systemtap.changes b/systemtap.changes
index 96d9ef5..fa89dd1 100644
--- a/systemtap.changes
+++ b/systemtap.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 18 09:46:52 CEST 2012 - jslaby@suse.de
+
+- Upgrade to version 1.8
+  Changelog: http://sourceware.org/ml/systemtap/2012-q2/msg00277.html
+
 -------------------------------------------------------------------
 Sat Feb 18 01:33:56 UTC 2012 - tonyj@suse.com
 
diff --git a/systemtap.spec b/systemtap.spec
index 3863462..e383139 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -27,15 +27,16 @@ BuildRequires:  mozilla-nss-tools
 BuildRequires:  pkg-config
 BuildRequires:  sqlite-devel
 BuildRequires:  systemd
-Version:        1.7
+Version:        1.8
 Release:        0
 Summary:        Instrumentation System
 License:        GPL-2.0+
 Group:          Development/Tools/Debuggers
 Url:            http://sourceware.org/systemtap/
-Source:         systemtap-%{version}.tar.bz2
+Source:         http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz
 Source2:        README-BEFORE-ADDING-PATCHES
 Source3:        stap-server.conf
+Patch0:         link-with-pthread.patch
 Obsoletes:      systemtap-client < 1.5
 Requires:       %{name}-runtime = %{version}-%{release}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -82,6 +83,7 @@ This package contains the support tools for static probes.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure --disable-docs --docdir=%{_docdir}/systemtap