diff --git a/Makefile.am b/Makefile.am
index 2a0c746..dd44a46 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,9 +25,9 @@ libstb_hal_la_LIBADD += \
 endif
 if BOXTYPE_GENERIC
 if BOXMODEL_RASPI
-SUBDIRS += raspi
+SUBDIRS += libraspi
 libstb_hal_la_LIBADD += \
-	raspi/libraspi.la
+	libraspi/libraspi.la
 else
 SUBDIRS += generic-pc
 libstb_hal_la_LIBADD += \
diff --git a/configure.ac b/configure.ac
index efdb063..51babe0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,9 +96,9 @@ libduckbox/Makefile
 libdvbci/Makefile
 libeplayer3/Makefile
 libeplayer3-arm/Makefile
+libraspi/Makefile
 libspark/Makefile
 libtriple/Makefile
-raspi/Makefile
 tools/Makefile
 ])
 
diff --git a/raspi/Makefile.am b/libraspi/Makefile.am
similarity index 100%
rename from raspi/Makefile.am
rename to libraspi/Makefile.am
diff --git a/raspi/audio.cpp b/libraspi/audio.cpp
similarity index 100%
rename from raspi/audio.cpp
rename to libraspi/audio.cpp
diff --git a/raspi/audio_lib.h b/libraspi/audio_lib.h
similarity index 100%
rename from raspi/audio_lib.h
rename to libraspi/audio_lib.h
diff --git a/raspi/dmx.cpp b/libraspi/dmx.cpp
similarity index 100%
rename from raspi/dmx.cpp
rename to libraspi/dmx.cpp
diff --git a/raspi/dmx_cs.h b/libraspi/dmx_cs.h
similarity index 100%
rename from raspi/dmx_cs.h
rename to libraspi/dmx_cs.h
diff --git a/raspi/dmx_lib.h b/libraspi/dmx_lib.h
similarity index 100%
rename from raspi/dmx_lib.h
rename to libraspi/dmx_lib.h
diff --git a/raspi/glfb.cpp b/libraspi/glfb.cpp
similarity index 100%
rename from raspi/glfb.cpp
rename to libraspi/glfb.cpp
diff --git a/raspi/glfb.h b/libraspi/glfb.h
similarity index 100%
rename from raspi/glfb.h
rename to libraspi/glfb.h
diff --git a/raspi/hardware_caps.c b/libraspi/hardware_caps.c
similarity index 100%
rename from raspi/hardware_caps.c
rename to libraspi/hardware_caps.c
diff --git a/raspi/init.cpp b/libraspi/init.cpp
similarity index 100%
rename from raspi/init.cpp
rename to libraspi/init.cpp
diff --git a/raspi/playback.cpp b/libraspi/playback.cpp
similarity index 100%
rename from raspi/playback.cpp
rename to libraspi/playback.cpp
diff --git a/raspi/playback_lib.h b/libraspi/playback_lib.h
similarity index 100%
rename from raspi/playback_lib.h
rename to libraspi/playback_lib.h
diff --git a/raspi/record.cpp b/libraspi/record.cpp
similarity index 100%
rename from raspi/record.cpp
rename to libraspi/record.cpp
diff --git a/raspi/record_lib.h b/libraspi/record_lib.h
similarity index 100%
rename from raspi/record_lib.h
rename to libraspi/record_lib.h
diff --git a/raspi/video.cpp b/libraspi/video.cpp
similarity index 100%
rename from raspi/video.cpp
rename to libraspi/video.cpp
diff --git a/raspi/video_lib.h b/libraspi/video_lib.h
similarity index 100%
rename from raspi/video_lib.h
rename to libraspi/video_lib.h