diff --git a/templates/openssl-fix-install.diff b/templates/openssl-fix-install.diff
new file mode 100644
index 00000000000..f5c68c895a1
--- /dev/null
+++ b/templates/openssl-fix-install.diff
@@ -0,0 +1,11 @@
+--- Makefile.org.orig	2008-10-24 06:41:08.000000000 +0200
++++ Makefile.org	2008-10-24 06:41:24.000000000 +0200
+@@ -125,7 +125,7 @@ TESTS = alltests
+ 
+ MAKEFILE= Makefile
+ 
+-MANDIR=$(OPENSSLDIR)/man
++MANDIR=$(INSTALLTOP)/share/man
+ MAN1=1
+ MAN3=3
+ MANSUFFIX=
diff --git a/templates/openssl-runstuff-after-install.sh b/templates/openssl-runstuff-after-install.sh
new file mode 100644
index 00000000000..937d2399fb2
--- /dev/null
+++ b/templates/openssl-runstuff-after-install.sh
@@ -0,0 +1,5 @@
+#
+# Grr. Stupid Makefile, remove stuff installed in wrong dir.
+#
+
+rm -rf $XBPS_DESTDIR/$pkgname-$version/usr/usr
diff --git a/templates/openssl.tmpl b/templates/openssl.tmpl
new file mode 100644
index 00000000000..b40879f6ef6
--- /dev/null
+++ b/templates/openssl.tmpl
@@ -0,0 +1,28 @@
+# Template file for 'openssl'
+pkgname=openssl
+version=0.9.8i
+patch_files="$pkgname-fix-install.diff"
+distfiles="http://www.openssl.org/source/$pkgname-$version@.tar.gz"
+build_style=configure
+configure_script="./Configure"
+configure_args="--prefix=/usr
+ --install_prefix=$XBPS_DESTDIR/$pkgname-$version --openssldir=/etc
+ zlib-dynamic shared threads"
+make_build_target="all"
+short_desc="Secure Socket Layer and cryptographic library"
+maintainer="Juan RP <xtraeme@gmail.com>"
+checksum=e8fc5fcfb715ffe925b2982aa9ca287832a93495d7fff03f17f6449f0732718c
+long_desc="
+ The OpenSSL Project is a collaborative effort to develop a robust,
+ commercial-grade, full-featured, and Open Source toolkit implementing the
+ Secure Sockets Layer (SSL v2/v3) and Transport Layer Security (TLS v1)
+ protocols as well as a full-strength general purpose cryptography library."
+
+build_depends="perl-5.10.0 zlib-1.2.3"
+run_depends="glibc-2.8 zlib-1.2.3"
+
+if [ "$xbps_machine" = "x86_64" ]; then
+	configure_args="$configure_args linux-x86_64"
+else
+	configure_args="$configure_args linux-elf"
+fi