diff --git a/examples/cpp/nqueens2.cc b/examples/cpp/nqueens2.cc
new file mode 100644
index 0000000000..986d38881a
--- /dev/null
+++ b/examples/cpp/nqueens2.cc
@@ -0,0 +1,60 @@
+// Copyright 2010-2014 Google
+// 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.
+
+//
+// N-queens problem
+//
+//  unique solutions: http://www.research.att.com/~njas/sequences/A000170
+//  distinct solutions: http://www.research.att.com/~njas/sequences/A002562
+
+
+#include "base/commandlineflags.h"
+#include "base/integral_types.h"
+#include "base/logging.h"
+#include "base/stringprintf.h"
+#include "constraint_solver/constraint_solver.h"
+
+DEFINE_int32(
+    size, 88,
+    "Size of the problem. If equal to 0, will test several increasing sizes.");
+
+namespace operations_research {
+void NQueens(int size) {
+  CHECK_GE(size, 1);
+  Solver s("nqueens");
+
+  // model
+  std::vector<IntVar*> queens;
+  for (int i = 0; i < size; ++i) {
+    queens.push_back(s.MakeIntVar(0, size - 1, StringPrintf("queen%04d", i)));
+  }
+  for (int i = 0; i < size - 1; ++i) {
+    for (int j = i + 1; j < size; ++j) {
+      s.AddConstraint(s.MakeNonEquality(queens[i], queens[j]));
+      s.AddConstraint(s.MakeNonEquality(s.MakeSum(queens[i], i), queens[j]));
+      s.AddConstraint(s.MakeNonEquality(s.MakeSum(queens[i], -i), queens[j]));
+    }
+  }
+  std::vector<SearchMonitor*> monitors;
+  DecisionBuilder* const db = s.MakePhase(queens, Solver::CHOOSE_FIRST_UNBOUND,
+                                          Solver::ASSIGN_MIN_VALUE);
+  monitors.push_back(s.MakeSearchLog(1000000));
+  s.Solve(db, monitors);  // go!
+}
+}  // namespace operations_research
+
+int main(int argc, char** argv) {
+  google::ParseCommandLineFlags( &argc, &argv, true);
+  operations_research::NQueens(FLAGS_size);
+  return 0;
+}
diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index 014a675d76..6e69b31463 100644
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -1394,6 +1394,12 @@ $(OBJ_DIR)/nqueens.$O: $(EX_DIR)/cpp/nqueens.cc $(SRC_DIR)/constraint_solver/con
 $(BIN_DIR)/nqueens$E: $(DYNAMIC_CP_DEPS) $(OBJ_DIR)/nqueens.$O
 	$(CCC) $(CFLAGS) $(OBJ_DIR)/nqueens.$O $(DYNAMIC_CP_LNK) $(DYNAMIC_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Snqueens$E
 
+$(OBJ_DIR)/nqueens2.$O: $(EX_DIR)/cpp/nqueens2.cc $(SRC_DIR)/constraint_solver/constraint_solver.h
+	$(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/nqueens2.cc $(OBJ_OUT)$(OBJ_DIR)$Snqueens2.$O
+
+$(BIN_DIR)/nqueens2$E: $(DYNAMIC_CP_DEPS) $(OBJ_DIR)/nqueens2.$O
+	$(CCC) $(CFLAGS) $(OBJ_DIR)/nqueens2.$O $(DYNAMIC_CP_LNK) $(DYNAMIC_LD_FLAGS) $(EXE_OUT)$(BIN_DIR)$Snqueens2$E
+
 $(OBJ_DIR)/pdptw.$O: $(EX_DIR)/cpp/pdptw.cc $(SRC_DIR)/constraint_solver/constraint_solver.h $(SRC_DIR)/constraint_solver/routing.h
 	$(CCC) $(CFLAGS) -c $(EX_DIR)$Scpp/pdptw.cc $(OBJ_OUT)$(OBJ_DIR)$Spdptw.$O