diff --git a/Makefile b/Makefile
index d78a535..8b50d4d 100644
--- a/Makefile
+++ b/Makefile
@@ -8,30 +8,24 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = glibc,ncurses
-ARCH = x86_64
-URL = http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+export SRCPKG = readline
+export DEPENDS = glibc,ncurses
+export ARCH = x86_64
+export URL = http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+BRIEF = Library which enhances the CLI
 DESC = The GNU Readline library provides a set of functions for use by \
 applications that allow users to edit command lines as they are typed in.
-SNAPVER = sr3
+SNAPVER = 4
 
 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
-MAKEINST = make install
-SNAPHACKS = install -d -v -m 755 $(ROOT)/lib && \
-	mv -v $(ROOT)/usr/lib/lib{readline,history}.so.* $(ROOT)/lib && \
-	ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libreadline.so` \
-		$(ROOT)/usr/lib/libreadline.so && \
-	ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libhistory.so` \
-		$(ROOT)/usr/lib/libhistory.so && \
-	install -v -m 644 $(SRCDIR)/doc/*.{ps,pdf,html,dvi} \
-		$(ROOT)/usr/share/doc/readline && \
-	rm -v $(ROOT)/usr/share/info/dir
+DEV := $(PWD)/readline-dev
+DEVROOT := $(DEV)/ROOT
 
 include /usr/share/snap/Makefile.snaplinux
 
@@ -58,7 +52,6 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure
 	@cd $(SRCDIR); \
 	./configure \
 		--prefix=/usr \
-		--disable-static \
 		--build=x86_64-snap-linux-gnu \
 		--host=x86_64-snap-linux-gnu \
 		--target=x86_64-snap-linux-gnu
@@ -80,12 +73,24 @@ $(ROOT): $(SRCDIR)/shlib/libhistory.so.$(VERSION)
 		$(ROOT)/usr/lib/libreadline.so && \
 	ln -sfv ../../lib/`readlink $(ROOT)/usr/lib/libhistory.so` \
 		$(ROOT)/usr/lib/libhistory.so && \
-	install -v -m 644 doc/*.{ps,pdf,html,dvi} \
-		$(ROOT)/usr/share/doc/readline && \
 	rm -v $(ROOT)/usr/share/info/dir
 
+	@install -v -d $(DEV)/SNAP && \
+	install -v -d $(DEVROOT) && \
+	install -v -d -m 755 $(DEVROOT)/usr/share/doc/readline && \
+	for file in `find $(ROOT)|egrep 'man3\/|\.a$$|\.c$$|\.h$$'`; do \
+		path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \
+		mkdir -p $$path; \
+		mv $$file $$path; \
+	done && \
+	install -v -m 644 $(SRCDIR)/doc/*.{ps,pdf,html,dvi} \
+		$(DEVROOT)/usr/share/doc/readline && \
+	find $(ROOT) -type d -empty -delete && \
+	cd $(DEV) && make -f ../Makefile.readline-dev && mv *.snap ../
+
 clean:
 	@rm -rvf $(ROOT) \
+		$(DEV) \
 		$(SNAPINFO) \
 		$(MANIFEST) \
 		$(FILES) \
diff --git a/Makefile.readline-dev b/Makefile.readline-dev
new file mode 100644
index 0000000..6c3616c
--- /dev/null
+++ b/Makefile.readline-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 = readline
+BRIEF = Development files for readline
+DESC = Development files for readline
+                                                                                
+include /usr/share/snap/Makefile.snaplinux