diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeaf05772..7a8be6250 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,16 +95,15 @@ add_subdirectory(gtsam)
 # Build Tests
 add_subdirectory(tests)
 
-
 # Build timing
 add_subdirectory(timing)
 
+# Build examples
+add_subdirectory(examples)
+
 # Build gtsam_unstable
 if (GTSAM_BUILD_UNSTABLE)
   add_subdirectory(gtsam_unstable)
-  
-  # Build examples (Note: 'examples' require `gtsam_unstable` be built since it links against it.)
-  add_subdirectory(examples)
 endif()
 
 # This is the new wrapper
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 4b4a81c59..52d90deb9 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -20,4 +20,4 @@ if (NOT GTSAM_USE_BOOST_FEATURES)
       )
 endif()
 
-gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam;gtsam_unstable;${Boost_PROGRAM_OPTIONS_LIBRARY}")
+gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam;${Boost_PROGRAM_OPTIONS_LIBRARY}")
diff --git a/gtsam_unstable/examples/CMakeLists.txt b/gtsam_unstable/examples/CMakeLists.txt
index 967937b22..ca6244aa0 100644
--- a/gtsam_unstable/examples/CMakeLists.txt
+++ b/gtsam_unstable/examples/CMakeLists.txt
@@ -9,4 +9,4 @@ if (NOT GTSAM_USE_BOOST_FEATURES)
 endif()
 
 
-gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam_unstable")
+gtsamAddExamplesGlob("*.cpp" "${excluded_examples}" "gtsam")
diff --git a/examples/FixedLagSmootherExample.cpp b/gtsam_unstable/examples/FixedLagSmootherExample.cpp
similarity index 100%
rename from examples/FixedLagSmootherExample.cpp
rename to gtsam_unstable/examples/FixedLagSmootherExample.cpp