diff --git a/README.packaging b/README.packaging
index 1ca5997..dcd1497 100644
--- a/README.packaging
+++ b/README.packaging
@@ -12,7 +12,7 @@ patch-level updates to older LLVM versions, and major/minor
 version updates.
 
 LLVM version numbers come in three levels.  For version
-X.0.Z, changes to the X level are major updates, changes to
+X.1.Z, changes to the X level are major updates, changes to
 the Y level are minor updates, and changes to the Z level
 are patch-level updates. Since LLVM 4, the minor version
 is always expected to be 0. [1]  Library .so numbers are
@@ -40,10 +40,10 @@ to be updated.
 
 1. llvmX package:
    1. Add the new sources to the package and delete the old
-      ones.  This will not include clang-docs-X.0.Z.src.tar.xz
-      or llvm-docs-X.0.Z.src.tar.xz (see next item).
-   2. Build clang-docs-X.0.Z.src.tar.xz and
-      llvm-docs-X.0.Z.src.tar.xz.  The instructions are in
+      ones.  This will not include clang-docs-X.1.Z.src.tar.xz
+      or llvm-docs-X.1.Z.src.tar.xz (see next item).
+   2. Build clang-docs-X.1.Z.src.tar.xz and
+      llvm-docs-X.1.Z.src.tar.xz.  The instructions are in
       the %install section of llvmX.spec.  The instructions
       need RPM substitutions, for example via rpmspec -P.
       Add those sources as well and delete the old ones.
@@ -69,10 +69,10 @@ needs to be created.
    1. Copy (do not link) the old llvmX to the new
       major/minor version number.
    2. Add the new sources to the package and delete the old
-      ones.  This will not include clang-docs-X.0.Z.src.tar.xz
-      or llvm-docs-X.0.Z.src.tar.xz (see next item).
-   3. Build clang-docs-X.0.Z.src.tar.xz and
-      llvm-docs-X.0.Z.src.tar.xz.  The instructions are in
+      ones.  This will not include clang-docs-X.1.Z.src.tar.xz
+      or llvm-docs-X.1.Z.src.tar.xz (see next item).
+   3. Build clang-docs-X.1.Z.src.tar.xz and
+      llvm-docs-X.1.Z.src.tar.xz.  The instructions are in
       the %install section of llvmX.spec.  The instructions
       need RPM substitutions, for example via rpmspec -P.
       Add those sources as well and delete the old ones.
diff --git a/llvm.changes b/llvm.changes
index 0a7e772..b4b200f 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Mar  9 20:32:49 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
+
+- Update to version 18.
+  * For details, see the release notes:
+    - https://releases.llvm.org/18.1.0/docs/ReleaseNotes.html
+    - https://releases.llvm.org/18.1.0/tools/clang/docs/ReleaseNotes.html
+    - https://releases.llvm.org/18.1.0/tools/clang/tools/extra/docs/ReleaseNotes.html
+    - https://releases.llvm.org/18.1.0/projects/libcxx/docs/ReleaseNotes.html
+    - https://releases.llvm.org/18.1.0/tools/lld/docs/ReleaseNotes.html
+- Add metapackage for libomp-devel.
+- Update packaging guidelines for new versioning scheme.
+
 -------------------------------------------------------------------
 Sat Oct 21 21:44:49 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm.spec b/llvm.spec
index c3156ed..29a3430 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package llvm
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,7 +16,7 @@
 #
 
 
-%define _sonum 17
+%define _sonum 18
 %ifarch aarch64 x86_64
 %define has_lldb 1
 %define has_lldb_python 1
@@ -32,6 +32,7 @@ Obsoletes:      %{1}13%{?2:-%{2}} \
 Obsoletes:      %{1}14%{?2:-%{2}} \
 Obsoletes:      %{1}15%{?2:-%{2}} \
 Obsoletes:      %{1}16%{?2:-%{2}} \
+Obsoletes:      %{1}17%{?2:-%{2}} \
 Obsoletes:      %{1}7%{?2:-%{2}} \
 Obsoletes:      %{1}8%{?2:-%{2}} \
 Obsoletes:      %{1}9%{?2:-%{2}}
@@ -66,7 +67,9 @@ Group:          Development/Libraries/C and C++
 Requires:       llvm%{_sonum}-devel
 Provides:       llvm-LTO-devel = %{version}
 Obsoletes:      llvm-LTO-devel < %{version}
+Requires:       libomp-devel
 Requires:       llvm-gold
+Requires:       llvm-polly-devel
 %obsolete_llvm_versioned llvm devel
 %obsolete_llvm_versioned llvm LTO-devel
 
@@ -250,6 +253,19 @@ LLD is a linker from the LLVM project. That is a drop-in replacement for
 system linkers and runs much faster than them. It also provides features that
 are useful for toolchain developers.
 
+%package -n libomp-devel
+Summary:        MPI plugin for LLVM
+Group:          Development/Libraries/C and C++
+Requires:       libomp%{_sonum}-devel
+%obsolete_llvm_versioned libomp devel
+
+%description -n libomp-devel
+This package contains the OpenMP MPI plugin for LLVM.
+
+This package is a dummy package that depends on the version of
+libomp-devel that openSUSE currently supports.  Packages that
+don't require a specific LLVM version should depend on this.
+
 %package polly
 Summary:        LLVM Framework for High-Level Loop and Data-Locality Optimizations
 Group:          Development/Languages/Other
@@ -338,6 +354,9 @@ echo "This is a dummy package to provide a dependency on the system compiler." >
 %files -n lld
 %doc README
 
+%files -n libomp-devel
+%doc README
+
 %files polly
 %doc README