diff --git a/riscv32-toolchain.cmake b/riscv32-toolchain.cmake
index 3f204cb..5d35033 100644
--- a/riscv32-toolchain.cmake
+++ b/riscv32-toolchain.cmake
@@ -32,11 +32,15 @@ set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
 # This logic checks the operating system.
 if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
     message("OS:: FreeBSD")
-    set(NEWLIB /usr/local/riscv/riscv32-unknown-elf/include)
+    #set(NEWLIB /usr/local/riscv/riscv32-unknown-elf/include)
+    set(NEWLIB /usr/local/lib/gcc/riscv32-unknown-elf/11.3.00/include)
     set(CMAKE_C_COMPILER riscv32-unknown-elf-gcc)
     set(CMAKE_CXX_COMPILER riscv32-unknown-elf-g++)
     set(CMAKE_ASM_COMPILER riscv32-unknown-elf-gcc)
-    set(CMAKE_FIND_ROOT_PATH /usr/local/riscv/)
+
+    # Don't know why this is here?
+    #set(CMAKE_FIND_ROOT_PATH /usr/local/riscv/)
+    set(CMAKE_FIND_ROOT_PATH /usr/local/lib/gcc/riscv32-unknown-elf/)
 
     #set(CMAKE_SYSROOT "/usr/local/riscv/" /usr/local/riscv/riscv32-unknown-elf)
 
@@ -46,10 +50,11 @@ if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "FreeBSD")
 
 elseif(${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Linux")
     message("OS:: LINUX")
-    set(NEWLIB /opt/riscv/riscv32-unknown-elf/include)
-    set(CMAKE_C_COMPILER riscv32-unknown-elf-gcc)
-    set(CMAKE_CXX_COMPILER riscv32-unknown-elf-g++)
-    set(CMAKE_ASM_COMPILER riscv32-unknown-elf-gcc)
+    set(NEWLIB /opt/riscv/riscv-none-elf/include)
+    #set(NEWLIB /usr/lib/gcc/riscv64-unknown-elf/12.2.0/include)
+    set(CMAKE_C_COMPILER riscv-none-elf-gcc)
+    set(CMAKE_CXX_COMPILER riscv-none-elf-g++)
+    set(CMAKE_ASM_COMPILER riscv-none-elf-gcc)
     
     # Without these two lines it freaks out.
     set(CMAKE_C_STANDARD_COMPUTED_DEFAULT GNU)