diff --git a/Makefile.am b/Makefile.am
index e7b6ec1..26e0355 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,7 +29,7 @@ SUBDIRS += libraspi
 libstb_hal_la_LIBADD += \
 	libraspi/libraspi.la
 else
-SUBDIRS += generic-pc
+SUBDIRS += libgeneric-pc
 libstb_hal_la_LIBADD += \
 	generic-pc/libgeneric.la
 endif
diff --git a/configure.ac b/configure.ac
index 4ba1b67..127c078 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,13 +108,13 @@ fi
 AC_OUTPUT([
 Makefile
 common/Makefile
-generic-pc/Makefile
 libarmbox/Makefile
 libazbox/Makefile
 libduckbox/Makefile
 libdvbci/Makefile
 libeplayer3/Makefile
 libeplayer3-arm/Makefile
+libgeneric-pc/Makefile
 libraspi/Makefile
 libspark/Makefile
 libtriple/Makefile
diff --git a/generic-pc/Makefile.am b/libgeneric-pc/Makefile.am
similarity index 100%
rename from generic-pc/Makefile.am
rename to libgeneric-pc/Makefile.am
diff --git a/generic-pc/audio.cpp b/libgeneric-pc/audio.cpp
similarity index 100%
rename from generic-pc/audio.cpp
rename to libgeneric-pc/audio.cpp
diff --git a/generic-pc/audio_lib.h b/libgeneric-pc/audio_lib.h
similarity index 100%
rename from generic-pc/audio_lib.h
rename to libgeneric-pc/audio_lib.h
diff --git a/generic-pc/clutterfb.cpp b/libgeneric-pc/clutterfb.cpp
similarity index 100%
rename from generic-pc/clutterfb.cpp
rename to libgeneric-pc/clutterfb.cpp
diff --git a/generic-pc/dmx.cpp b/libgeneric-pc/dmx.cpp
similarity index 100%
rename from generic-pc/dmx.cpp
rename to libgeneric-pc/dmx.cpp
diff --git a/generic-pc/glfb.cpp b/libgeneric-pc/glfb.cpp
similarity index 100%
rename from generic-pc/glfb.cpp
rename to libgeneric-pc/glfb.cpp
diff --git a/generic-pc/glfb_priv.h b/libgeneric-pc/glfb_priv.h
similarity index 100%
rename from generic-pc/glfb_priv.h
rename to libgeneric-pc/glfb_priv.h
diff --git a/generic-pc/hardware_caps.c b/libgeneric-pc/hardware_caps.c
similarity index 100%
rename from generic-pc/hardware_caps.c
rename to libgeneric-pc/hardware_caps.c
diff --git a/generic-pc/init.cpp b/libgeneric-pc/init.cpp
similarity index 100%
rename from generic-pc/init.cpp
rename to libgeneric-pc/init.cpp
diff --git a/generic-pc/playback.cpp b/libgeneric-pc/playback.cpp
similarity index 100%
rename from generic-pc/playback.cpp
rename to libgeneric-pc/playback.cpp
diff --git a/generic-pc/playback_gst.h b/libgeneric-pc/playback_gst.h
similarity index 100%
rename from generic-pc/playback_gst.h
rename to libgeneric-pc/playback_gst.h
diff --git a/generic-pc/playback_gst_01.cpp b/libgeneric-pc/playback_gst_01.cpp
similarity index 100%
rename from generic-pc/playback_gst_01.cpp
rename to libgeneric-pc/playback_gst_01.cpp
diff --git a/generic-pc/playback_gst_10.cpp b/libgeneric-pc/playback_gst_10.cpp
similarity index 100%
rename from generic-pc/playback_gst_10.cpp
rename to libgeneric-pc/playback_gst_10.cpp
diff --git a/generic-pc/playback_lib.h b/libgeneric-pc/playback_lib.h
similarity index 100%
rename from generic-pc/playback_lib.h
rename to libgeneric-pc/playback_lib.h
diff --git a/generic-pc/record.cpp b/libgeneric-pc/record.cpp
similarity index 100%
rename from generic-pc/record.cpp
rename to libgeneric-pc/record.cpp
diff --git a/generic-pc/record_lib.h b/libgeneric-pc/record_lib.h
similarity index 100%
rename from generic-pc/record_lib.h
rename to libgeneric-pc/record_lib.h
diff --git a/generic-pc/video.cpp b/libgeneric-pc/video.cpp
similarity index 100%
rename from generic-pc/video.cpp
rename to libgeneric-pc/video.cpp
diff --git a/generic-pc/video_lib.h b/libgeneric-pc/video_lib.h
similarity index 100%
rename from generic-pc/video_lib.h
rename to libgeneric-pc/video_lib.h