diff --git a/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java b/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java
index 1e4a90d5..73d2e610 100644
--- a/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java
+++ b/src/main/java/hudson/plugins/android_emulator/EmulatorConfig.java
@@ -150,7 +150,7 @@ private String getGeneratedAvdName() {
         String platform = osVersion.getTargetName().replaceAll("[^a-zA-Z0-9._-]", "_");
         String abi = "";
         if (targetAbi != null && osVersion.requiresAbi()) {
-            abi = "_" + targetAbi.replace(' ', '-').replace('_', '-');
+            abi = "_" + targetAbi.replaceAll("[^a-zA-Z0-9._-]", "-");
         }
         String suffix = "";
         if (avdNameSuffix != null) {