diff --git a/CMakeLists.txt b/CMakeLists.txt
index 705f55ae..51a79892 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -284,6 +284,10 @@ if(${PROJECT_NAME}_PYTHON_BINDINGS)
   if(CMAKE_BUILD_TYPE MATCHES "^[Dd]eb" OR ${PROJECT_NAME}_STATIC)
     message(FATAL_ERROR "** Python Bindings are disabled in debug or static builds.")
   endif()
+  if(CMAKE_UNITY_BUILD)
+    message(FATAL_ERROR "** Python Bindings are disabled in Unity builds. "
+                        "Try again with CMAKE_UNITY_BUILD=OFF")
+  endif()
 endif()
 if(${PROJECT_NAME}_PYTHON_BINDINGS)
   add_subdirectory(python)
diff --git a/Changelog b/Changelog
index a2162417..0de0801a 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,5 @@
 * v1.7.0 (unreleased)
- - X11: Fixed dragging a maximized floating window. Its size is now restored to normal size when the drag starts.
+
 
 * v1.6.0 (unreleased)
  - Fixed restoring of normal geometry when closing a maximized window (#259)
@@ -11,6 +11,7 @@
  - Fixed case where unfloating wouldn't restore to the main window (#44 and #96)
  - Fixed MainWindow not propagating close events to docked widgets
  - X11: Improved detecting which window is under the cursor, by using native X11 API
+ - X11: Fixed dragging a maximized floating window. Its size is now restored to normal size when the drag starts.
 
 * v1.5.0 (24 November 2021)
  - Install the Python bindings to "site-packages"