diff --git a/CHANGES.txt b/CHANGES.txt
index af1b5c419c..710ee67450 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,8 @@
  * Fix missing fields in CLI `show schema` output (CASSANDRA-3304)
  * Fix broken CompressedRandomAccessReaderTest (CASSANDRA-3298)
  * Nodetool no longer leaks threads and closes JMX connections (CASSANDRA-3309)
+ * (CQL) fix type information returned for wildcard queries (CASSANDRA-3311)
+
 
 1.0.0-rc2
  * Log a meaningful warning when a node receives a message for a repair session
diff --git a/bin/cassandra.in.sh b/bin/cassandra.in.sh
index 464cc370f3..1a696af4fe 100644
--- a/bin/cassandra.in.sh
+++ b/bin/cassandra.in.sh
@@ -39,3 +39,4 @@ CLASSPATH=$CASSANDRA_CONF:$cassandra_bin
 for jar in $CASSANDRA_HOME/lib/*.jar; do
     CLASSPATH=$CLASSPATH:$jar
 done
+echo $CLASSPATH
\ No newline at end of file
diff --git a/src/java/org/apache/cassandra/cql/QueryProcessor.java b/src/java/org/apache/cassandra/cql/QueryProcessor.java
index 67f0ced82e..1ee3927457 100644
--- a/src/java/org/apache/cassandra/cql/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql/QueryProcessor.java
@@ -586,6 +586,11 @@ public class QueryProcessor
                         {
                             if (c.isMarkedForDelete())
                                 continue;
+
+                            ColumnDefinition cd = metadata.getColumnDefinition(c.name());
+                            if (cd != null)
+                                result.schema.value_types.put(c.name(), TypeParser.getShortName(cd.getValidator()));
+
                             thriftColumns.add(thriftify(c));
                         }
                     }