diff --git a/CMake/VTKModules.cmake b/CMake/VTKModules.cmake
index e5c67e00bd0ee8a78fe7040ea638676fb94f0ef7..fe643e1b6540afa1b8933971644ed461bd621e61 100644
--- a/CMake/VTKModules.cmake
+++ b/CMake/VTKModules.cmake
@@ -405,6 +405,10 @@ if (PARAVIEW_ENABLE_PDAL)
   list (APPEND _vtk_modules vtkIOPDAL)
 endif()
 
+if (PARAVIEW_ENABLE_SEGY)
+  list (APPEND _vtk_modules vtkIOSegY)
+endif()
+
 
 if (PARAVIEW_USE_MPI)
   list (APPEND _vtk_modules ${_vtk_mpi_modules})
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ba131fb7fe8f5816f19b0e203323a05386ed553..500571ae64a9e8c8e66fbc750321a1df1f34ddbd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -243,6 +243,8 @@ option(PARAVIEW_ENABLE_LAS "Enable LAS support." OFF)
 mark_as_advanced(PARAVIEW_ENABLE_LAS)
 option(PARAVIEW_ENABLE_PDAL "Enable PDAL support." OFF)
 mark_as_advanced(PARAVIEW_ENABLE_PDAL)
+option(PARAVIEW_ENABLE_SEGY "Enable SegY support." OFF)
+mark_as_advanced(PARAVIEW_ENABLE_SEGY)
 
 
 if (UNIX)
diff --git a/ParaViewCore/ServerManager/SMApplication/CMakeLists.txt b/ParaViewCore/ServerManager/SMApplication/CMakeLists.txt
index e1a31f9e70d85994d8c8199ed879e658fcaa0e44..5cbfc8914cc0b71b75bf28d876f5cb0a78ea0bdd 100644
--- a/ParaViewCore/ServerManager/SMApplication/CMakeLists.txt
+++ b/ParaViewCore/ServerManager/SMApplication/CMakeLists.txt
@@ -141,6 +141,12 @@ if (vtkiopdal_index GREATER 0)
     ${CMAKE_CURRENT_SOURCE_DIR}/Resources/proxies_pdal.xml)
 endif()
 
+list(FIND VTK_MODULES_ENABLED "vtkIOSegY" vtkiosegy_index)
+if (vtkiosegy_index GREATER 0)
+  list(APPEND requestedResourceFiles
+    ${CMAKE_CURRENT_SOURCE_DIR}/Resources/proxies_segy.xml)
+endif()
+
 
 list(FIND VTK_MODULES_ENABLED "vtkIOADIOS" vtkioadios_index)
 if (vtkioadios_index GREATER 0)
diff --git a/ParaViewCore/ServerManager/SMApplication/Resources/proxies_segy.xml b/ParaViewCore/ServerManager/SMApplication/Resources/proxies_segy.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e42c2341a8fe70e218064821df61c2839bc5f44d
--- /dev/null
+++ b/ParaViewCore/ServerManager/SMApplication/Resources/proxies_segy.xml
@@ -0,0 +1,113 @@
+<ServerManagerConfiguration>
+  <ProxyGroup name="sources">
+    <SourceProxy class="vtkSegYReader"
+                 label="SegY Reader"
+                 name="SegY Reader">
+      <Documentation short_help="Reads SEG-Y data files.">
+        SEG-Y Reader reads SEG-Y data files. We create a Structured
+        Grid for 2.5D SEG-Y and 3D data. If we set the StructuredGrid
+        option to false we create a Image Data for 3D data. This saves
+        memory and may speed-up certain algorithms, but the postion
+        and the shape of the data may not be correct. The axes for the
+        data are: crossline, inline, depth.
+      </Documentation>
+      <StringVectorProperty animateable="0"
+                            command="SetFileName"
+                            name="FileName"
+                            number_of_elements="1">
+        <FileListDomain name="files" />
+        <Documentation>This property specifies the file name for the
+        SEG-Y reader.</Documentation>
+      </StringVectorProperty>
+      <IntVectorProperty command="SetXYCoordMode"
+                         default_values="0"
+                         name="XYCoordMode"
+                         number_of_elements="1"
+                         panel_visibility="advanced">
+        <EnumerationDomain name="enum">
+          <Entry text="Source"
+                 value="0" />
+          <Entry text="CDP"
+                 value="1" />
+          <Entry text="Custom"
+                 value="2" />
+        </EnumerationDomain>
+        <Documentation>
+Specify whether to use source x/y coordinates or CDP coordinates or custom
+byte positions for data position in the SEG-Y trace header. Defaults to
+source x/y coordinates.
+
+As per SEG-Y rev 2.0 specification:
+
+- Source XY coordinate bytes = (73, 77)
+- CDP XY coordinate bytes = (181, 185)
+        </Documentation>
+      </IntVectorProperty>
+      <IntVectorProperty command="SetXCoordByte"
+                         default_values="73"
+                         name="XCoordByte"
+                         number_of_elements="1"
+                         panel_visibility="advanced">
+        <IntRangeDomain name="range" />
+        <Documentation>
+          Specify X and Y byte positions for custom XYCoordinateMode.
+          By default, XCoordByte = 73, YCoordByte = 77 i.e. source xy.
+        </Documentation>
+      </IntVectorProperty>
+      <IntVectorProperty command="SetYCoordByte"
+                         default_values="76"
+                         name="YCoordByte"
+                         number_of_elements="1"
+                         panel_visibility="advanced">
+        <IntRangeDomain name="range" />
+        <Documentation>
+          Specify X and Y byte positions for custom XYCoordinateMode.
+          By default, XCoordByte = 73, YCoordByte = 77 i.e. source xy.
+        </Documentation>
+      </IntVectorProperty>
+      <IntVectorProperty command="SetVerticalCRS"
+                         default_values="0"
+                         name="VerticalCRS"
+                         number_of_elements="1"
+                         panel_visibility="advanced">
+        <EnumerationDomain name="enum">
+          <Entry text="Heigths"
+                 value="0" />
+          <Entry text="Depths"
+                 value="1" />
+        </EnumerationDomain>
+        <Documentation>
+Specify whether the vertical coordinates in the SEG-Y file are heights
+(positive up) or depths (positive down). By default, the vertical
+coordinates are treated as heights (i.e. positive up). This means that the
+Z-axis of the dataset goes from 0 (surface) to -ve depth (last sample).
+Note. As per the SEG-Y rev 2.0 specification, this information is defined
+in the Location Data Stanza of the Extended Textual Header. However, as of
+this revision, SegYReader does not support reading the extended
+textual header.
+        </Documentation>
+      </IntVectorProperty>
+      <IntVectorProperty
+                         command="SetStructuredGrid"
+                         name="StructuredGrid"
+                         number_of_elements="1"
+                         default_values="1"
+                         panel_visibility="advanced">
+        <BooleanDomain name="bool" />
+        <Documentation>
+          Specify if we create a Structured Grid even when the data is
+          SEG-Y 3D. Note this consumes more memory but it shows the
+          precise location for each point and the correct shape of the
+          data. The default value is true. If we set this option to
+          false we create an Image Data for a SEG-Y 3D dataset.
+        </Documentation>
+      </IntVectorProperty>
+      <Hints>
+        <ReaderFactory extensions="sgy segy"
+                       file_description="SEG-Y Files" />
+      </Hints>
+    </SourceProxy>
+    <!-- End SegYReader -->
+  </ProxyGroup>
+
+</ServerManagerConfiguration>