diff --git a/.gitignore b/.gitignore
index e69de29..e645249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/1.8.9.tar.gz
diff --git a/sources b/sources
index e69de29..666c742 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+545a6190ae27cd323a6b4846e2f1f250  1.8.9.tar.gz
diff --git a/tmate-1.8.9_use_system_libs.patch b/tmate-1.8.9_use_system_libs.patch
new file mode 100644
index 0000000..ed8b565
--- /dev/null
+++ b/tmate-1.8.9_use_system_libs.patch
@@ -0,0 +1,29 @@
+Index: tmate-1.8.9/Makefile.am
+===================================================================
+--- tmate-1.8.9.orig/Makefile.am
++++ tmate-1.8.9/Makefile.am
+@@ -22,7 +22,6 @@ CFLAGS += -D_GNU_SOURCE
+ endif
+ 
+ CFLAGS += -Wno-unused-parameter -Wno-unused-variable
+-CFLAGS += -Ilibssh/include/ -Imsgpack/src
+ CFLAGS += -rdynamic # for stack traces
+ 
+ # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
+@@ -242,15 +241,4 @@ nodist_tmate_SOURCES += compat/b64_ntop.
+ endif
+ 
+ tmate_LDADD = \
+-	libssh/build/src/libssh.a \
+-	msgpack/src/.libs/libmsgpackc.a
+-
+-*.c: $(tmate_LDADD)
+-
+-libssh/build/src/libssh.a:
+-	cd libssh/build && cmake .. -DWITH_SFTP=OFF -DWITH_SERVER=OFF -DWITH_PCAP=OFF -DWITH_STATIC_LIB=ON -DWITH_GSSAPI=OFF
+-	+make -C libssh/build ssh_static
+-
+-msgpack/src/.libs/libmsgpackc.a:
+-	cd msgpack && ./bootstrap && ./configure
+-	+make -C msgpack/src libmsgpackc.la
++	-lssh -lmsgpackc
diff --git a/tmate.spec b/tmate.spec
new file mode 100644
index 0000000..c48ce2a
--- /dev/null
+++ b/tmate.spec
@@ -0,0 +1,51 @@
+Name:           tmate
+Version:        1.8.9
+Release:        2
+
+Summary:        Instant terminal sharing
+License:        MIT
+Url:            http://tmate.io
+
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  pkgconfig
+BuildRequires:  ruby
+BuildRequires:  libevent-devel
+BuildRequires:  openssl-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libssh-devel >= 0.6.0
+BuildRequires:  msgpack-devel >= 0.5.8
+
+Source0:        https://github.com/nviennot/tmate/archive/1.8.9.tar.gz
+
+Patch0:         tmate-1.8.9_use_system_libs.patch
+
+%description
+Tmate is a fork of tmux providing an instant pairing solution.
+
+%prep
+%setup -q -n %{name}-%{version}
+
+%patch0 -p1 -b .tmate-1.8.9_use_system_libs.patch
+
+%build
+./autogen.sh
+%configure
+make %{?_smp_mflags}
+
+%install
+make DESTDIR=%{buildroot} install
+
+%files
+%defattr(-,root,root)
+%doc CHANGES FAQ README-tmux README.md
+%{_bindir}/tmate
+%{_mandir}/man1/tmate.1*
+
+%changelog
+* Tue Apr 29 2014 - Andreas Schneider <asn@redhat.com> - 1.8.9-2
+- Fixed 'make' calls.
+
+* Fri Apr 25 2014 - Andreas Schneider <asn@redhat.com> - 1.8.9-1
+- The big bang.