diff --git a/companion/src/cmake/FindXsd.cmake b/companion/src/cmake/FindXsd.cmake
index d75882a075a..d26f9aaef36 100644
--- a/companion/src/cmake/FindXsd.cmake
+++ b/companion/src/cmake/FindXsd.cmake
@@ -8,13 +8,14 @@
 # XSD_FOUND, If false, don't try to use xsd
 
 FIND_PATH( XSD_INCLUDE_DIR xsd/cxx/parser/elements.hxx
-  "/opt/local/xsd-3.3.0-i686-macosx/libxsd"
+  "/opt/local/xsd-3.3.0-i686-macosx/libxsd"
   "C:/Programs/xsd-3.3.0/libxsd"
   "C:/Program Files/CodeSynthesis XSD 3.2/include"
   "C:/mingw/xsd-3.3.0-i686-windows/libxsd"
   $ENV{XSDDIR}/include
   $ENV{CODESYNTH}/include
-  /usr/local/include /usr/include  
+  /usr/local/include /usr/include
+  $ENV{XSDDIR}/libxsd
 )
 
 IF( WIN32 )
@@ -27,18 +28,19 @@ ENDIF( )
 FIND_PROGRAM( XSDCXX_EXECUTABLE
   NAMES
     ${XSDCXX_FILENAME1} ${XSDCXX_FILENAME2}
-  PATHS
+  PATHS
     "/opt/local/xsd-3.3.0-i686-macosx/bin"
     "C:/Programs/xsd-3.3.0/bin"
-    "C:/mingw/xsd-3.3.0-i686-windows/bin"  
+    "C:/mingw/xsd-3.3.0-i686-windows/bin"
     "C:/Program Files/CodeSynthesis XSD 3.2/bin"
     $ENV{XSDDIR}/bin
     /usr/local/bin
     /usr/bin
+    $ENV{XSDDIR}/xsd
 )
 
 MESSAGE(STATUS ${XSDCXX_EXECUTABLE})
-      
+
 # if the include and the program are found then we have it
 IF( XSD_INCLUDE_DIR )
   IF( XSDCXX_EXECUTABLE )
@@ -49,4 +51,4 @@ ENDIF( XSD_INCLUDE_DIR )
 MARK_AS_ADVANCED(
   XSD_INCLUDE_DIR
   XSDCXX_EXECUTABLE
-)
\ No newline at end of file
+)