diff --git a/srcpkgs/libgsm/libgsm-devel.template b/srcpkgs/libgsm/libgsm-devel.template
index 50f79d7b35..1bdaa4e3b9 100644
--- a/srcpkgs/libgsm/libgsm-devel.template
+++ b/srcpkgs/libgsm/libgsm-devel.template
@@ -8,14 +8,14 @@ long_desc="${long_desc}
 Add_dependency run glibc-devel
 Add_dependency run libgsm
 
-revision=1
+revision=2
 
 do_install()
 {
 	vmkdir usr/lib
-	mv ${wrksrc}/lib/*.a ${DESTDIR}/usr/lib
-	vmkdir usr/include
-        mv ${wrksrc}/inc ${DESTDIR}/usr/include/gsm
-	cd ${DESTDIR}/usr/include && \
-		ln -s gsm/gsm.h
+	vinstall lib/libgsm.a 644 usr/lib
+	vmkdir usr/include/gsm
+        vcopy "inc/*" usr/include/gsm
+	rm -f ${DESTDIR}/usr/include/gsm/*.orig
+	cd ${DESTDIR}/usr/include && ln -s gsm/gsm.h
 }
diff --git a/srcpkgs/libgsm/patches/sharedlib.patch b/srcpkgs/libgsm/patches/sharedlib.patch
new file mode 100644
index 0000000000..80cb4b2666
--- /dev/null
+++ b/srcpkgs/libgsm/patches/sharedlib.patch
@@ -0,0 +1,53 @@
+--- Makefile.orig	2011-11-03 11:49:56.862331506 +0100
++++ Makefile	2011-11-03 11:53:52.750659225 +0100
+@@ -140,6 +140,7 @@ LFLAGS	= $(LDFLAGS) $(LDINC)
+ # Targets
+ 
+ LIBGSM	= $(LIB)/libgsm.a
++LIBGSM_SO = $(LIB)/libgsm.so
+ 
+ TOAST	= $(BIN)/toast
+ UNTOAST	= $(BIN)/untoast
+@@ -257,6 +258,7 @@ STUFF = 	ChangeLog			\
+ # Install targets
+ 
+ GSM_INSTALL_TARGETS =	\
++		$(GSM_INSTALL_LIB)/libgsm.so		\
+ 		$(GSM_INSTALL_LIB)/libgsm.a		\
+ 		$(GSM_INSTALL_INC)/gsm.h		\
+ 		$(GSM_INSTALL_MAN)/gsm.3		\
+@@ -274,12 +276,12 @@ TOAST_INSTALL_TARGETS =	\
+ # Default rules
+ 
+ .c.o:
+-		$(CC) $(CFLAGS) $?
++		$(CC) -fPIC -DPIC $(CFLAGS) $?
+ 		@-mv `$(BASENAME) $@` $@ > /dev/null 2>&1
+ 
+ # Target rules
+ 
+-all:		$(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST)
++all:		$(LIBGSM) $(LIBGSM_SO) $(TOAST) $(TCAT) $(UNTOAST)
+ 		@-echo $(ROOT): Done.
+ 
+ tst:		$(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result
+@@ -304,6 +306,9 @@ $(LIBGSM):	$(LIB) $(GSM_OBJECTS)
+ 		$(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS)
+ 		$(RANLIB) $(LIBGSM)
+ 
++$(LIBGSM_SO):	$(LIB) $(GSM_OBJECTS)
++		-rm $(RMFLAGS) $(LIBGSM_SO)
++		$(LD) -shared $(LFLAGS) -o $(LIBGSM_SO) $(GSM_OBJECTS)
+ 
+ # Toast, Untoast and Tcat -- the compress-like frontends to gsm.
+ 
+@@ -398,6 +403,9 @@ $(GSM_INSTALL_LIB)/libgsm.a:	$(LIBGSM)
+ 		cp $? $@
+ 		chmod 444 $@
+ 
++$(GSM_INSTALL_LIB)/libgsm.so:	$(LIBGSM_SO)
++		-rm $@
++		install -m755 $? $@
+ 
+ # Distribution
+ 
diff --git a/srcpkgs/libgsm/template b/srcpkgs/libgsm/template
index d63c6adf2f..3279c09039 100644
--- a/srcpkgs/libgsm/template
+++ b/srcpkgs/libgsm/template
@@ -1,7 +1,8 @@
 # Template file for 'libgsm'
 pkgname=libgsm
 version=1.0.13
-revision=3
+wrksrc=gsm-1.0-pl13
+revision=4
 homepage="http://www.quut.com/gsm/"
 distfiles="http://libgsm.sourcearchive.com/downloads/${version}/${pkgname}_${version}.orig.tar.gz"
 short_desc="GSM 06.10 lossy speech compression"
@@ -17,19 +18,15 @@ long_desc="
 
 subpackages="$pkgname-devel"
 
-wrksrc=gsm-1.0-pl13
-
 Add_dependency run glibc
 
-do_build()
-{
+do_build() {
 	make ${makejobs}
-	gcc -shared ${wrksrc}/src/*.o -o ${wrksrc}/lib/libgsm.so
 }
 
-do_install()
-{
+do_install() {
 	vmkdir usr/lib
-	mv ${wrksrc}/bin ${DESTDIR}/usr
-	mv ${wrksrc}/lib/*.so ${DESTDIR}/usr/lib
+	vmkdir usr/bin
+	install -m755 ${wrksrc}/bin/* ${DESTDIR}/usr/bin
+	install -m755 ${wrksrc}/lib/*.so ${DESTDIR}/usr/lib
 }