diff --git a/cmake/modules/FindDBus.cmake b/cmake/modules/FindDBus.cmake
index 6a9259061..550d6bbd7 100644
--- a/cmake/modules/FindDBus.cmake
+++ b/cmake/modules/FindDBus.cmake
@@ -34,14 +34,16 @@ find_path(DBUS_INCLUDES
 find_path(DBUS_ARCH_INCLUDES
     NAMES
     dbus/dbus-arch-deps.h
-    PATH_SUFFIXES dbus-1.0
+    PATH_SUFFIXES dbus-1.0/include
     HINTS
     $ENV{DBUSDIR}/include
+    $ENV{DBUSDIR}/lib
     ${PC_DBUS_INCLUDEDIR}
+    ${PC_DBUS_LIBDIR}
     /usr/include
     /usr/local/include
-    /usr/lib/dbus-1.0/include
-    /usr/local/lib/dbus-1.0/include
+    /usr/lib
+    /usr/local/lib
     ${INCLUDE_INSTALL_DIR}
 )
 
diff --git a/cmake/modules/FindGLib2.cmake b/cmake/modules/FindGLib2.cmake
index ab969ff6a..3a9195894 100644
--- a/cmake/modules/FindGLib2.cmake
+++ b/cmake/modules/FindGLib2.cmake
@@ -37,7 +37,9 @@ find_path(GLIB2_CONFIG_INCLUDES
     PATH_SUFFIXES glib-2.0/include
     HINTS
     $ENV{GLIB2DIR}/include
+    $ENV{GLIB2DIR}/lib
     ${PC_GLIB2_INCLUDEDIR}
+    ${PC_GLIB2_LIBDIR}
     /usr/include
     /usr/local/include
     /usr/lib