diff --git a/ports/supertux.hash b/ports/supertux.hash
index 421376d..95a4f1e 100644
--- a/ports/supertux.hash
+++ b/ports/supertux.hash
@@ -1 +1 @@
-dummy
+a1a62fbc455c9ece49f11ff6e5a7c5c99cfa0ba3
diff --git a/run/ltris.run b/run/ltris.run
index e020008..15be3a0 100644
--- a/run/ltris.run
+++ b/run/ltris.run
@@ -6,11 +6,10 @@ set build_components {
 	core init
 	drivers/timer
 	app/ltris server/ram_fs
-	drivers/framebuffer drivers/pci drivers/input
+	drivers/framebuffer drivers/platform drivers/input
 }
 
-lappend_if [have_spec usb]          build_components drivers/usb
-lappend_if [have_spec platform_rpi] build_components drivers/platform
+lappend_if [have_spec usb] build_components drivers/usb
 
 build $build_components
 
@@ -46,12 +45,7 @@ append_if [have_spec sdl] config {
 			<service name="Input"/>
 			<service name="Framebuffer"/>
 		</provides>
-	</start>}
-
-append_if [have_spec pci] config {
-	<start name="pci_drv" priority="-1">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="PCI"/></provides>
+		<config width="640" height="480"/>
 	</start>}
 
 append_if [have_spec platform_rpi] config {
@@ -91,7 +85,7 @@ append config {
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
 		<config>
-			<policy label="" root="/" writeable="yes" />
+			<policy root="/" writeable="yes" />
 			<content>
 				<dir name="var"/>
 			</content>
@@ -136,7 +130,6 @@ set boot_modules {
 
 # platform-specific modules
 lappend_if [have_spec        linux] boot_modules fb_sdl
-lappend_if [have_spec          pci] boot_modules pci_drv
 lappend_if [have_spec  framebuffer] boot_modules fb_drv
 lappend_if [have_spec          ps2] boot_modules ps2_drv
 lappend_if [have_spec          usb] boot_modules usb_drv
diff --git a/run/numptyphysics.run b/run/numptyphysics.run
index dac074d..4a238c7 100644
--- a/run/numptyphysics.run
+++ b/run/numptyphysics.run
@@ -6,11 +6,10 @@ set build_components {
 	core init
 	drivers/timer
 	app/numptyphysics server/ram_fs
-	drivers/framebuffer drivers/pci drivers/input
+	drivers/framebuffer drivers/platform drivers/input
 }
 
-lappend_if [have_spec usb]          build_components drivers/usb
-lappend_if [have_spec platform_rpi] build_components drivers/platform
+lappend_if [have_spec usb] build_components drivers/usb
 
 build $build_components
 
@@ -48,12 +47,6 @@ append_if [have_spec sdl] config {
 		</provides>
 	</start>}
 
-append_if [have_spec pci] config {
-	<start name="pci_drv" priority="-1">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="PCI"/></provides>
-	</start>}
-
 append_if [have_spec platform_rpi] config {
 	<start name="platform_drv" priority="-1">
 		<resource name="RAM" quantum="1M"/>
@@ -65,6 +58,7 @@ append_if [have_spec framebuffer] config {
 	<start name="fb_drv" priority="-1">
 		<resource name="RAM" quantum="4M"/>
 		<provides><service name="Framebuffer"/></provides>
+		<config buffered="yes" />
 	</start>}
 
 append_if [have_spec ps2] config {
@@ -89,7 +83,7 @@ append config {
 	<start name="ram_fs" priority="-1">
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="" root="/" writeable="yes" /> </config>
+		<config> <policy writeable="yes" root="/"/> </config>
 	</start>
 
 	<start name="numptyphysics" priority="-2">
@@ -134,7 +128,6 @@ set boot_modules {
 
 # platform-specific modules
 lappend_if [have_spec        linux] boot_modules fb_sdl
-lappend_if [have_spec          pci] boot_modules pci_drv
 lappend_if [have_spec  framebuffer] boot_modules fb_drv
 lappend_if [have_spec          ps2] boot_modules ps2_drv
 lappend_if [have_spec          usb] boot_modules usb_drv
diff --git a/run/supertux.run b/run/supertux.run
index 062c769..07188e8 100644
--- a/run/supertux.run
+++ b/run/supertux.run
@@ -6,11 +6,10 @@ set build_components {
 	core init
 	drivers/timer
 	app/supertux server/ram_fs
-	drivers/framebuffer drivers/pci drivers/input
+	drivers/framebuffer drivers/platform drivers/input
 }
 
-lappend_if [have_spec usb]          build_components drivers/usb
-lappend_if [have_spec platform_rpi] build_components drivers/platform
+lappend_if [have_spec usb] build_components drivers/usb
 
 build $build_components
 
@@ -48,12 +47,6 @@ append_if [have_spec sdl] config {
 		</provides>
 	</start>}
 
-append_if [have_spec pci] config {
-	<start name="pci_drv" priority="-1">
-		<resource name="RAM" quantum="1M"/>
-		<provides><service name="PCI"/></provides>
-	</start>}
-
 append_if [have_spec platform_rpi] config {
 	<start name="platform_drv" priority="-1">
 		<resource name="RAM" quantum="1M"/>
@@ -90,7 +83,7 @@ append config {
 	<start name="ram_fs" priority="-1">
 		<resource name="RAM" quantum="4M"/>
 		<provides> <service name="File_system"/> </provides>
-		<config> <policy label="" root="/" writeable="yes" /> </config>
+		<config> <policy writeable="yes" root="/"/> </config>
 	</start>
 
 	<start name="supertux" priority="-2">
@@ -134,7 +127,6 @@ set boot_modules {
 
 # platform-specific modules
 lappend_if [have_spec        linux] boot_modules fb_sdl
-lappend_if [have_spec          pci] boot_modules pci_drv
 lappend_if [have_spec  framebuffer] boot_modules fb_drv
 lappend_if [have_spec          ps2] boot_modules ps2_drv
 lappend_if [have_spec          usb] boot_modules usb_drv
diff --git a/src/app/supertux/target.mk b/src/app/supertux/target.mk
index cd4e74a..1a1b2b1 100644
--- a/src/app/supertux/target.mk
+++ b/src/app/supertux/target.mk
@@ -16,4 +16,6 @@ $(TARGET): supertux_data.tar
 supertux_data.tar:
 	$(VERBOSE)cd $(SUPERTUX_DIR); tar cf $(PWD)/bin/$@ data
 
-CC_OPT += -DNOOPENGL -DDATA_PREFIX='"/data"'
+CC_OPT += -DNOOPENGL -DDATA_PREFIX='"/data"' -fpermissive
+
+CC_CXX_OPT_STD = -std=gnu++98