diff --git a/Source/cmVisualStudioGeneratorOptions.cxx b/Source/cmVisualStudioGeneratorOptions.cxx
index ed0d60ced..ae496ad12 100644
--- a/Source/cmVisualStudioGeneratorOptions.cxx
+++ b/Source/cmVisualStudioGeneratorOptions.cxx
@@ -299,7 +299,12 @@ cmVisualStudioGeneratorOptions
         {
         fout << "<" << m->first << ">";
         }
-      fout  << m->second << "</" << m->first << ">\n";
+      fout  << m->second;
+      if (m->first == "AdditionalIncludeDirectories")
+        {
+        fout  << ";%(AdditionalIncludeDirectories)";
+        }
+      fout  << "</" << m->first << ">\n";
       }
     }
   else
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e9aed1650..bf08b5278 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2043,6 +2043,18 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     ADD_TEST_MACRO(CompileCommandOutput
       "${CMake_BINARY_DIR}/Tests/CMakeLib/runcompilecommands")
   ENDIF()
+
+  ADD_TEST(IncludeDirectories ${CMAKE_CTEST_COMMAND}
+    --build-and-test
+    "${CMake_SOURCE_DIR}/Tests/IncludeDirectories"
+    "${CMake_BINARY_DIR}/Tests/IncludeDirectories"
+    --build-two-config
+    --build-generator ${CMAKE_TEST_GENERATOR}
+    --build-project IncludeDirectories
+    --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+    --test-command IncludeDirectories)
+  LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/IncludeDirectories")
+
 ENDIF(BUILD_TESTING)
 
 SUBDIRS(CMakeTests)
diff --git a/Tests/IncludeDirectories/CMakeLists.txt b/Tests/IncludeDirectories/CMakeLists.txt
new file mode 100644
index 000000000..af2a2b786
--- /dev/null
+++ b/Tests/IncludeDirectories/CMakeLists.txt
@@ -0,0 +1,10 @@
+cmake_minimum_required (VERSION 2.6)
+project(IncludeDirectories)
+
+set(CMAKE_CXX_FLAGS "\"-I${CMAKE_SOURCE_DIR}/Flags\"")
+include_directories(${CMAKE_SOURCE_DIR}/IncDir)
+set_source_files_properties(main.cpp PROPERTIES COMPILE_FLAGS
+  "\"-I${CMAKE_SOURCE_DIR}/SrcProp\"")
+add_executable(IncludeDirectories main.cpp)
+set_target_properties(IncludeDirectories
+  PROPERTIES COMPILE_FLAGS "\"-I${CMAKE_SOURCE_DIR}/TarProp\"")
diff --git a/Tests/IncludeDirectories/Flags/Flags.h b/Tests/IncludeDirectories/Flags/Flags.h
new file mode 100644
index 000000000..039751509
--- /dev/null
+++ b/Tests/IncludeDirectories/Flags/Flags.h
@@ -0,0 +1 @@
+// include Flags.h
diff --git a/Tests/IncludeDirectories/IncDir/IncDir.h b/Tests/IncludeDirectories/IncDir/IncDir.h
new file mode 100644
index 000000000..7c0ca9644
--- /dev/null
+++ b/Tests/IncludeDirectories/IncDir/IncDir.h
@@ -0,0 +1 @@
+// include IncDir.h
diff --git a/Tests/IncludeDirectories/SrcProp/SrcProp.h b/Tests/IncludeDirectories/SrcProp/SrcProp.h
new file mode 100644
index 000000000..18b42cc12
--- /dev/null
+++ b/Tests/IncludeDirectories/SrcProp/SrcProp.h
@@ -0,0 +1 @@
+// include SrcProp.h
diff --git a/Tests/IncludeDirectories/TarProp/TarProp.h b/Tests/IncludeDirectories/TarProp/TarProp.h
new file mode 100644
index 000000000..59326f60d
--- /dev/null
+++ b/Tests/IncludeDirectories/TarProp/TarProp.h
@@ -0,0 +1 @@
+// include TarProp.h
diff --git a/Tests/IncludeDirectories/main.cpp b/Tests/IncludeDirectories/main.cpp
new file mode 100644
index 000000000..a59d27c39
--- /dev/null
+++ b/Tests/IncludeDirectories/main.cpp
@@ -0,0 +1,9 @@
+#include "Flags.h"
+#include "IncDir.h"
+#include "SrcProp.h"
+#include "TarProp.h"
+
+int main(int argc, char** argv)
+{
+  return 0;
+}