diff --git a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java
index 648be715d..4855ccac9 100644
--- a/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java
+++ b/querydsl-core/src/main/java/com/mysema/query/types/ExpressionUtils.java
@@ -256,7 +256,8 @@ public final class ExpressionUtils {
                     like = like + "$";
                 }   
             }            
-            like = like.replace(".", "\\.").replace("%", ".*").replace("_", ".");
+            like = like.replace(".", "\\.").replace("*", "\\*").replace("?", "\\?")
+                       .replace("%", ".*").replace("_", ".");
             return ConstantImpl.create(like);
         } else if (expr instanceof Operation<?>) {
             Operation<?> o = (Operation<?>)expr;