diff --git a/include/etl/profiles/cpp17.h b/include/etl/profiles/cpp17.h
new file mode 100644
index 00000000..d65c45e6
--- /dev/null
+++ b/include/etl/profiles/cpp17.h
@@ -0,0 +1,48 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2018 jwellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#ifndef ETL_CPP17_INCLUDED
+#define ETL_CPP17_INCLUDED
+
+//*****************************************************************************
+// Generic C++17
+//*****************************************************************************
+
+#define ETL_TARGET_DEVICE_GENERIC
+#define ETL_TARGET_OS_NONE
+#define ETL_COMPILER_GENERIC
+#define ETL_CPP11_SUPPORTED 1
+#define ETL_CPP14_SUPPORTED 1
+#define ETL_CPP17_SUPPORTED 1
+#define ETL_NO_NULLPTR_SUPPORT 0
+#define ETL_NO_LARGE_CHAR_SUPPORT 0
+#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 1
+
+#endif
diff --git a/include/etl/profiles/cpp17_no_stl.h b/include/etl/profiles/cpp17_no_stl.h
new file mode 100644
index 00000000..46b67c53
--- /dev/null
+++ b/include/etl/profiles/cpp17_no_stl.h
@@ -0,0 +1,49 @@
+///\file
+
+/******************************************************************************
+The MIT License(MIT)
+
+Embedded Template Library.
+https://github.com/ETLCPP/etl
+https://www.etlcpp.com
+
+Copyright(c) 2018 jwellbelove
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files(the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions :
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+******************************************************************************/
+
+#ifndef ETL_CPP17_NO_STL_INCLUDED
+#define ETL_CPP17_NO_STL_INCLUDED
+
+//*****************************************************************************
+// Generic C++17 without STL support
+//*****************************************************************************
+
+#define ETL_TARGET_DEVICE_GENERIC
+#define ETL_TARGET_OS_NONE
+#define ETL_COMPILER_GENERIC
+#define ETL_CPP11_SUPPORTED 1
+#define ETL_CPP14_SUPPORTED 1
+#define ETL_CPP17_SUPPORTED 1
+#define ETL_NO_NULLPTR_SUPPORT 0
+#define ETL_NO_LARGE_CHAR_SUPPORT 0
+#define ETL_CPP11_TYPE_TRAITS_IS_TRIVIAL_SUPPORTED 0
+#define ETL_NO_STL
+
+#endif
diff --git a/include/etl/profiles/etl_profile.h b/include/etl/profiles/etl_profile.h
index 45596b1a..187bcb5b 100644
--- a/include/etl/profiles/etl_profile.h
+++ b/include/etl/profiles/etl_profile.h
@@ -29,7 +29,7 @@ SOFTWARE.
 ******************************************************************************/
 #ifndef __ETL_PROFILE_H__
 #define __ETL_PROFILE_H__
-#ifdef PROFILE_MSVC 
+#ifdef PROFILE_MSVC
   #include "msvc_x86.h"
 #elif PROFILE_GCC_GENERIC
   #include "gcc_generic.h"
@@ -51,9 +51,11 @@ SOFTWARE.
   #include "cpp11.h"
 #elif PROFILE_CPP14_GENERIC
   #include "cpp14.h"
+#elif PROFILE_CPP17_GENERIC
+  #include "cpp17.h"
 #elif PROFILE_CUSTOM
   #include "custom_profile.h"
-#else 
+#else
   #error Must provide a profile header file when buiding ETL. See https://www.etlcpp.com/setup.html
 #endif