diff --git a/srcpkgs/syslinux/template b/srcpkgs/syslinux/template
index a352736fc8..2c8cfb0555 100644
--- a/srcpkgs/syslinux/template
+++ b/srcpkgs/syslinux/template
@@ -16,14 +16,15 @@ nopie=yes
 
 pre_build() {
 	# Do not try to build the Windows or DOS installers and DIAG files
-	sed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i Makefile
-	sed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i Makefile
-	sed 's|dosutil/\*.com dosutil/\*.sys||g' -i Makefile
-	sed 's|dos/syslinux.com||g' -i Makefile
-	sed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i Makefile
-	sed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i Makefile
+	vsed 's|diag libinstaller dos win32 win64 dosutil txt|libinstaller txt|g' -i Makefile
+	vsed 's|win32/syslinux.exe win64/syslinux64.exe||g' -i Makefile
+	vsed 's|dosutil/\*.com dosutil/\*.sys||g' -i Makefile
+	vsed 's|dos/syslinux.com||g' -i Makefile
+	vsed 's|INSTALLSUBDIRS = com32 utils dosutil|INSTALLSUBDIRS = com32 utils|g' -i Makefile
+	vsed 's|install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|# install -m 644 -c $(INSTALL_DIAG) $(INSTALLROOT)$(DIAGDIR)|g' -i Makefile
 	# Fix FHS manpage path
-	sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
+	vsed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
+	vsed '/GCCOPT += $(call gcc_ok,-fPIC)/i GCCOPT += $(call gcc_ok,-fcommon)' -i mk/lib.mk
 }
 
 do_build() {