diff --git a/firmware/SOURCES b/firmware/SOURCES
index e792bee89f..3b49206728 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -1479,6 +1479,7 @@ target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
 target/arm/s5l8700/ipodnano2g/nand-nano2g.c
 target/arm/s5l8700/ipodnano2g/pmu-nano2g.c
 target/arm/s5l8700/ipodnano2g/rtc-nano2g.c
+target/arm/s5l8700/usb-nano2g-6g.c
 #ifndef BOOTLOADER
 target/arm/s5l8700/ipodnano2g/audio-nano2g.c
 target/arm/s5l8700/ipodnano2g/piezo-nano2g.c
@@ -1501,6 +1502,7 @@ target/arm/s5l8702/postmortemstub.S
 #endif
 target/arm/s5l8702/ipod6g/pmu-ipod6g.c
 target/arm/s5l8702/ipod6g/rtc-ipod6g.c
+target/arm/s5l8700/usb-nano2g-6g.c
 #ifndef BOOTLOADER
 target/arm/s5l8702/timer-s5l8702.c
 target/arm/s5l8702/debug-s5l8702.c
diff --git a/firmware/target/arm/s5l8700/usb-nano2g-6g.c b/firmware/target/arm/s5l8700/usb-nano2g-6g.c
new file mode 100644
index 0000000000..7f5d38a5ae
--- /dev/null
+++ b/firmware/target/arm/s5l8700/usb-nano2g-6g.c
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2009 by Michael Sparmann
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include "config.h"
+#include "usb.h"
+
+#ifdef HAVE_USBSTACK
+#include "usb_core.h"
+#include "power.h"
+
+void usb_enable(bool on)
+{
+    if (on) usb_core_init();
+    else usb_core_exit();
+}
+
+int usb_detect(void)
+{
+    if (charger_inserted())
+        return USB_INSERTED;
+    return USB_EXTRACTED;
+}
+#else
+void usb_enable(bool on)
+{
+    (void)on;
+}
+
+int usb_detect(void)
+{
+    return USB_EXTRACTED;
+}
+#endif
diff --git a/firmware/target/arm/usb-s3c6400x.c b/firmware/target/arm/usb-s3c6400x.c
index 4b0382d2cd..cf346f1de1 100644
--- a/firmware/target/arm/usb-s3c6400x.c
+++ b/firmware/target/arm/usb-s3c6400x.c
@@ -390,24 +390,11 @@ void usb_init_device(void)
     usb_drv_exit();
 }
 
-void usb_enable(bool on)
-{
-    if (on) usb_core_init();
-    else usb_core_exit();
-}
-
 void usb_attach(void)
 {
     usb_enable(true);
 }
 
-int usb_detect(void)
-{
-    if (charger_inserted())
-        return USB_INSERTED;
-    return USB_EXTRACTED;
-}
-
 #else
 void usb_init_device(void)
 {
@@ -425,15 +412,4 @@ void usb_init_device(void)
     PWRCON(1) |= 0x8;
 #endif
 }
-
-void usb_enable(bool on)
-{
-    (void)on;
-}
-
-/* Always return false for now */
-int usb_detect(void)
-{
-    return USB_EXTRACTED;
-}
 #endif