diff --git a/rbutil/ipodpatcher/Makefile b/rbutil/ipodpatcher/Makefile
index 3bbdb51eb7..a67316187e 100644
--- a/rbutil/ipodpatcher/Makefile
+++ b/rbutil/ipodpatcher/Makefile
@@ -1,13 +1,13 @@
 CFLAGS=-Wall
 
-BOOT_H = ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h
+BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h
 
 # Uncomment the next two lines to build with embedded bootloaders and the 
 # --install option and interactive mode.  You need the full set of Rockbox 
 # bootloaders in this directory - download them from
 # http://download.rockbox.org/bootloader/ipod/bootloaders.zip
 
-#BOOTSRC = ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c
+#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c
 #CFLAGS += -DWITH_BOOTOBJS
 
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
@@ -48,6 +48,9 @@ ipodpatcher-ppc: $(SRC) ipodio-posix.c $(BOOTSRC)
 ipod2c: ipod2c.c
 	$(NATIVECC) $(CFLAGS) -o ipod2c ipod2c.c
 
+ipod1g2g.c: bootloader-ipod1g2g.ipod ipod2c
+	./ipod2c bootloader-ipod1g2g.ipod ipod1g2g
+
 ipod3g.c: bootloader-ipod3g.ipod ipod2c
 	./ipod2c bootloader-ipod3g.ipod ipod3g
 
diff --git a/rbutil/ipodpatcher/ipodpatcher.c b/rbutil/ipodpatcher/ipodpatcher.c
index 4d2bfa31a7..395fd6953d 100644
--- a/rbutil/ipodpatcher/ipodpatcher.c
+++ b/rbutil/ipodpatcher/ipodpatcher.c
@@ -31,6 +31,7 @@
 #include "ipodpatcher.h"
 
 #ifdef WITH_BOOTOBJS
+#include "ipod1g2g.h"
 #include "ipod3g.h"
 #include "ipod4g.h"
 #include "ipodmini.h"
@@ -1134,6 +1135,16 @@ int list_images(struct ipod_t* ipod)
 int getmodel(struct ipod_t* ipod, int ipod_version)
 {
     switch (ipod_version) {
+        case 0x01:
+            ipod->modelstr="1st or 2nd Generation";
+            ipod->modelnum = 19;
+            ipod->modelname = "1g2g";
+            ipod->targetname = "ipod1g2g";
+#ifdef WITH_BOOTOBJS
+            ipod->bootloader = ipod1g2g;
+            ipod->bootloader_len = LEN_ipod1g2g;
+#endif
+            break;
         case 0x02:
             ipod->modelstr="3rd Generation";
             ipod->modelnum = 7;