diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java
new file mode 100644
index 000000000..beb0c08da
--- /dev/null
+++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2011-2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cassandra.core.cql.generator;
+
+import static org.springframework.cassandra.core.cql.CqlStringUtils.noNull;
+
+import java.util.Map;
+
+import org.springframework.cassandra.core.keyspace.AddColumnSpecification;
+import org.springframework.cassandra.core.keyspace.AlterColumnSpecification;
+import org.springframework.cassandra.core.keyspace.AlterKeyspaceSpecification;
+import org.springframework.cassandra.core.keyspace.ColumnChangeSpecification;
+import org.springframework.cassandra.core.keyspace.DropColumnSpecification;
+import org.springframework.cassandra.core.keyspace.Option;
+
+/**
+ * CQL generator for generating ALTER TABLE statements.
+ *
+ * @author Matthew T. Adams
+ */
+public class AlterKeyspaceCqlGenerator extends KeyspaceOptionsCqlGenerator {
+
+ public AlterKeyspaceCqlGenerator(AlterKeyspaceSpecification specification) {
+ super(specification);
+ }
+
+ public StringBuilder toCql(StringBuilder cql) {
+ cql = noNull(cql);
+
+ preambleCql(cql);
+// changesCql(cql);
+// optionsCql(cql);
+
+ cql.append(";");
+
+ return cql;
+ }
+
+ protected StringBuilder preambleCql(StringBuilder cql) {
+ return noNull(cql).append("ALTER KEYSPACE ").append(spec().getNameAsIdentifier()).append(" ");
+ }
+
+// protected StringBuilder changesCql(StringBuilder cql) {
+// cql = noNull(cql);
+//
+// boolean first = true;
+// for (ColumnChangeSpecification change : spec().getChanges()) {
+// if (first) {
+// first = false;
+// } else {
+// cql.append(" ");
+// }
+// getCqlGeneratorFor(change).toCql(cql);
+// }
+//
+// return cql;
+// }
+//
+// protected ColumnChangeCqlGenerator> getCqlGeneratorFor(ColumnChangeSpecification change) {
+// if (change instanceof AddColumnSpecification) {
+// return new AddColumnCqlGenerator((AddColumnSpecification) change);
+// }
+// if (change instanceof DropColumnSpecification) {
+// return new DropColumnCqlGenerator((DropColumnSpecification) change);
+// }
+// if (change instanceof AlterColumnSpecification) {
+// return new AlterColumnCqlGenerator((AlterColumnSpecification) change);
+// }
+// throw new IllegalArgumentException("unknown ColumnChangeSpecification type: " + change.getClass().getName());
+// }
+//
+// @SuppressWarnings("unchecked")
+// protected StringBuilder optionsCql(StringBuilder cql) {
+// cql = noNull(cql);
+//
+// Map options = spec().getOptions();
+// if (options == null || options.isEmpty()) {
+// return cql;
+// }
+//
+// cql.append(" WITH ");
+// boolean first = true;
+// for (String key : options.keySet()) {
+// if (first) {
+// first = false;
+// } else {
+// cql.append(" AND ");
+// }
+//
+// cql.append(key);
+//
+// Object value = options.get(key);
+// if (value == null) {
+// continue;
+// }
+// cql.append(" = ");
+//
+// if (value instanceof Map) {
+// optionValueMap((Map