diff --git a/VersionASM b/VersionASM
index 1e97afaaf8ffa746054a03a798f893fed7158156..3e11733cbb629e69e3a2a99b122dc2074b24098c 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.257"
-Module_Date             SETS    "07 Feb 2015"
-Module_ApplicationDate  SETS    "07-Feb-15"
+Module_MinorVersion     SETS    "4.79.2.258"
+Module_Date             SETS    "26 Feb 2015"
+Module_ApplicationDate  SETS    "26-Feb-15"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.257)"
-Module_HelpVersion      SETS    "5.35 (07 Feb 2015) 4.79.2.257"
+Module_FullVersion      SETS    "5.35 (4.79.2.258)"
+Module_HelpVersion      SETS    "5.35 (26 Feb 2015) 4.79.2.258"
                         END
diff --git a/VersionNum b/VersionNum
index ea91a30c8877095ef3d8b2f18bb1339ba3926de6..f893141762136d159aa5cfb8a9c2b0bde6cc9c13 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.257
-#define Module_Date_CMHG                07 Feb 2015
+#define Module_MinorVersion_CMHG        4.79.2.258
+#define Module_Date_CMHG                26 Feb 2015
 
 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.257"
-#define Module_Date                     "07 Feb 2015"
+#define Module_MinorVersion             "4.79.2.258"
+#define Module_Date                     "26 Feb 2015"
 
-#define Module_ApplicationDate          "07-Feb-15"
+#define Module_ApplicationDate          "26-Feb-15"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.35 (4.79.2.257)"
-#define Module_HelpVersion              "5.35 (07 Feb 2015) 4.79.2.257"
+#define Module_FullVersion              "5.35 (4.79.2.258)"
+#define Module_HelpVersion              "5.35 (26 Feb 2015) 4.79.2.258"
 #define Module_LibraryVersionInfo       "5:35"
diff --git a/hdr/GPIODevice b/hdr/GPIODevice
index 839ba733221cf84610492d22ed430ff505d3677c..42cea79c46cc215221570eb178f276706c5a9b2f 100644
--- a/hdr/GPIODevice
+++ b/hdr/GPIODevice
@@ -41,6 +41,7 @@ GPIOType_OMAP3_BeagleBoard       #       1 ; It's a BeagleBoard or BB-xM
 GPIOType_OMAP3_DevKit8000        #       1 ; It's a DevKit 8000
 GPIOType_OMAP3_IGEPv2            #       1 ; It's an IGEP v2
 GPIOType_OMAP3_Pandora           #       1 ; It's a Pandora
+GPIOType_OMAP3_TouchBook         #       1 ; It's a TouchBook
 
 ; BeagleBoard revision values:
 
@@ -70,6 +71,11 @@ GPIORevision_IGEPv2_C            #       1 ; Rev C (not a B-compatible one)
                                  ^       0
 GPIORevision_Pandora_Unknown     #       1
 
+; TouchBook revision values:
+
+                                 ^       0
+GPIORevision_TouchBook_Unknown   #       1
+
 ; Type & revision values specific to HALDeviceID_GPIO_BCM2835:
 
                                  ^       0