diff --git a/Makefile b/Makefile
index a231d1a..8e50466 100644
--- a/Makefile
+++ b/Makefile
@@ -8,24 +8,25 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS =
-ARCH = x86_64
-URL = https://www.openssl.org/
+export SRCPKG = openssl
+export DEPENDS = glibc
+export ARCH = x86_64
+export URL = https://www.openssl.org/
+BRIEF = Library routines for TLS and SSL
 DESC = OpenSSL is an open source project that provides a robust, \
 commercial-grade, and full-featured toolkit for the Transport Layer \
 Security (TLS) and Secure Sockets Layer (SSL) protocols.
-SNAPVER = sr0
+SNAPVER = 2
 
 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1)
 TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n')
 SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//')
 PATCHDIR := $(PWD)/SRC/patches
-VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER)
+export VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'| \
+	sed 's/^-//')-$(SNAPVER)
 
-MAKE = make depend && make
-MAKEINST = make MANDIR=/usr/share/man MANSUFFIX=ssl install
-SNAPHACKS = install -d -v -m 755 $(ROOT)/usr/share/doc/openssl && \
-	cp -vr $(SRCDIR)/doc/* $(ROOT)/usr/share/doc/openssl
+DEV := $(PWD)/openssl-dev
+DEVROOT := $(DEV)/ROOT
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -45,8 +46,9 @@ $(SRCDIR)/config: $(ARCHIVE)
 	@touch $(SRCDIR)/config
 
 $(SRCDIR)/config.log: $(SRCDIR)/config
-	@cd $(SRCDIR) && for patch in `find $(PATCHDIR) -name \*.patch`; do \
-		patch --verbose -Np1 -i $$patch; \
+	@cd $(SRCDIR) && \
+	for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \
+		patch --verbose -Np0 -i $$patch; \
 	done
 	@cd $(SRCDIR); \
 	./config \
@@ -57,8 +59,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/config
 		zlib-dynamic
 
 $(SRCDIR)/apps/openssl: $(SRCDIR)/config.log
-	@cd $(SRCDIR); \
-	$(MAKE)
+	@cd $(SRCDIR) && make depend && make
 
 $(ROOT): $(SRCDIR)/apps/openssl
 	@if [ -d $(ROOT) ]; then \
@@ -67,10 +68,20 @@ $(ROOT): $(SRCDIR)/apps/openssl
 		mkdir -v $(ROOT); \
 	fi
 
-	@cd $(SRCDIR); \
-	$(MAKEINST) INSTALL_PREFIX=$(ROOT)
+	@cd $(SRCDIR) && make MANDIR=/usr/share/man install \
+		INSTALL_PREFIX=$(ROOT)
 
-	@$(SNAPHACKS)
+	@install -v -d $(DEV)/SNAP && \
+	install -v -d $(DEVROOT) && \
+	install -d -v -m 755 $(DEVROOT)/usr/share/doc/openssl && \
+	cp -vr $(SRCDIR)/doc/* $(DEVROOT)/usr/share/doc/openssl && \
+	for file in `find $(ROOT)|egrep 'man3\/|pkgconfig\/|\.a$$|\.h$$'`; do \
+		path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
+		mkdir -p $$path; \
+		mv $$file $$path; \
+	done && \
+	find $(ROOT) -type d -empty -delete && \
+	cd $(DEV) && make -f ../Makefile.openssl-dev && mv *.snap ../
 
 test: $(ROOT)
 	@cd $(SRCDIR); \
@@ -78,6 +89,7 @@ test: $(ROOT)
 
 clean:
 	@rm -rvf $(ROOT) \
+		$(DEV) \
 		$(SNAPINFO) \
 		$(MANIFEST) \
 		$(FILES) \
diff --git a/Makefile.openssl-dev b/Makefile.openssl-dev
new file mode 100644
index 0000000..7e029d4
--- /dev/null
+++ b/Makefile.openssl-dev
@@ -0,0 +1,15 @@
+# This file is free software; you can redistribute it and/or modify             
+# it under the terms of the GNU General Public License version 2 as             
+# published by the Free Software Foundation here:                               
+# (http://www.gnu.org/licenses/gpl-2.0.html)                                    
+#                                                                               
+# This program is distributed in the hope that it will be useful,               
+# but WITHOUT ANY WARRANTY; without even the implied warranty of                
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                 
+# GNU General Public License for more details.                                  
+                                                                                
+DEPENDS = openssl
+BRIEF = Development files for openssl
+DESC = Development files for openssl
+                                                                                
+include /usr/share/snap/Makefile.snaplinux