diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4ccdd9..835e143 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,12 @@ target_link_libraries(boost_assert
   INTERFACE
     Boost::config
 )
+file(GLOB_RECURSE boost_assert_IDEFILES CONFIGURE_DEPENDS include/*.hpp)
+source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_assert_IDEFILES})
+if (CMAKE_GENERATOR MATCHES "Visual Studio")
+    list(APPEND boost_assert_IDEFILES extra/boost_assert.natvis)
+endif()
+target_sources(boost_assert PRIVATE ${boost_assert_IDEFILES})
 
 # BUILD_TESTING is the standard CTest variable that enables testing
 
diff --git a/extra/boost_assert.natvis b/extra/boost_assert.natvis
new file mode 100644
index 0000000..56bc7eb
--- /dev/null
+++ b/extra/boost_assert.natvis
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+
+<Type Name="boost::source_location">
+    <DisplayString>{function_,sb} @ {file_,sb}:{line_}</DisplayString>
+    <Expand>
+        <Item Name="[file]">file_,sb</Item>
+        <Item Name="[line]">line_</Item>
+        <Item Name="[column]">column_</Item>
+        <Item Name="[function]">function_,sb</Item>
+    </Expand>
+</Type>
+
+</AutoVisualizer>