diff --git a/src/main/java/hudson/plugins/android_emulator/util/Utils.java b/src/main/java/hudson/plugins/android_emulator/util/Utils.java
index c4d16149..0a4786cb 100644
--- a/src/main/java/hudson/plugins/android_emulator/util/Utils.java
+++ b/src/main/java/hudson/plugins/android_emulator/util/Utils.java
@@ -46,7 +46,7 @@
 
 public class Utils {
 
-    private static final Pattern REVISION = Pattern.compile("(\\d+)(?:\\.\\d+){0,2}");
+    private static final Pattern REVISION = Pattern.compile("(\\d++).*");
 
     /**
      * Retrieves the configured Android SDK root directory.
diff --git a/src/test/java/hudson/plugins/android_emulator/util/UtilsTest.java b/src/test/java/hudson/plugins/android_emulator/util/UtilsTest.java
index 46ad6d2d..60a455f4 100644
--- a/src/test/java/hudson/plugins/android_emulator/util/UtilsTest.java
+++ b/src/test/java/hudson/plugins/android_emulator/util/UtilsTest.java
@@ -7,6 +7,10 @@ public void testParseRevisionString() throws Exception {
         assertEquals(20, Utils.parseRevisionString("20.0.1"));
         assertEquals(20, Utils.parseRevisionString("20.0"));
         assertEquals(20, Utils.parseRevisionString("20"));
+        assertEquals(20, Utils.parseRevisionString("20.foo"));
+        assertEquals(21, Utils.parseRevisionString("21 rc4"));
+        assertEquals(21, Utils.parseRevisionString("21 rc3"));
+
     }
 
     public void testParseRevisionStringFailureCase() throws Exception {
@@ -15,11 +19,5 @@ public void testParseRevisionStringFailureCase() throws Exception {
             fail("expected exception");
         } catch (NumberFormatException e) {
         }
-
-        try {
-            Utils.parseRevisionString("20.foo");
-            fail("expected exception");
-        } catch (NumberFormatException e) {
-        }
     }
 }