diff --git a/manifest/armv7l/g/glfw.filelist b/manifest/armv7l/g/glfw.filelist
index 6e57ad02d..0d554e5b5 100644
--- a/manifest/armv7l/g/glfw.filelist
+++ b/manifest/armv7l/g/glfw.filelist
@@ -6,5 +6,5 @@
 /usr/local/lib/cmake/glfw3/glfw3Targets-release.cmake
 /usr/local/lib/libglfw.so
 /usr/local/lib/libglfw.so.3
-/usr/local/lib/libglfw.so.3.3
+/usr/local/lib/libglfw.so.3.4
 /usr/local/lib/pkgconfig/glfw3.pc
diff --git a/manifest/i686/g/glfw.filelist b/manifest/i686/g/glfw.filelist
deleted file mode 100644
index 6e57ad02d..000000000
--- a/manifest/i686/g/glfw.filelist
+++ /dev/null
@@ -1,10 +0,0 @@
-/usr/local/include/GLFW/glfw3.h
-/usr/local/include/GLFW/glfw3native.h
-/usr/local/lib/cmake/glfw3/glfw3Config.cmake
-/usr/local/lib/cmake/glfw3/glfw3ConfigVersion.cmake
-/usr/local/lib/cmake/glfw3/glfw3Targets.cmake
-/usr/local/lib/cmake/glfw3/glfw3Targets-release.cmake
-/usr/local/lib/libglfw.so
-/usr/local/lib/libglfw.so.3
-/usr/local/lib/libglfw.so.3.3
-/usr/local/lib/pkgconfig/glfw3.pc
diff --git a/manifest/x86_64/g/glfw.filelist b/manifest/x86_64/g/glfw.filelist
index cf0786765..5f22fea64 100644
--- a/manifest/x86_64/g/glfw.filelist
+++ b/manifest/x86_64/g/glfw.filelist
@@ -6,5 +6,5 @@
 /usr/local/lib64/cmake/glfw3/glfw3Targets-release.cmake
 /usr/local/lib64/libglfw.so
 /usr/local/lib64/libglfw.so.3
-/usr/local/lib64/libglfw.so.3.3
+/usr/local/lib64/libglfw.so.3.4
 /usr/local/lib64/pkgconfig/glfw3.pc
diff --git a/packages/glfw.rb b/packages/glfw.rb
index f0e171cf9..b7071cc19 100644
--- a/packages/glfw.rb
+++ b/packages/glfw.rb
@@ -1,35 +1,25 @@
-require 'package'
+require 'buildsystems/cmake'
 
-class Glfw < Package
+class Glfw < CMake
   description 'GLFW is an Open Source, multi-platform library for OpenGL, OpenGL ES and Vulkan development on the desktop. It provides a simple API for creating windows, contexts and surfaces, receiving input and events.'
   homepage 'http://www.glfw.org/'
-  version '3.3.2'
+  version '3.4'
   license 'ZLIB'
-  compatibility 'all'
-  source_url 'https://github.com/glfw/glfw/releases/download/3.3.2/glfw-3.3.2.zip'
-  source_sha256 '08a33a512f29d7dbf78eab39bd7858576adcc95228c9efe8e4bc5f0f3261efc7'
-  binary_compression 'tar.xz'
+  compatibility 'x86_64 aarch64 armv7l'
+  source_url 'https://github.com/glfw/glfw/releases/download/3.4/glfw-3.4.zip'
+  source_sha256 'b5ec004b2712fd08e8861dc271428f048775200a2df719ccf575143ba749a3e9'
+  binary_compression 'tar.zst'
 
   binary_sha256({
     aarch64: '375586eebe407a72dd6e819c236c75d45cdb6af2fb284452d92767ec0586a031',
      armv7l: '375586eebe407a72dd6e819c236c75d45cdb6af2fb284452d92767ec0586a031',
-       i686: 'c52b95bd167f4b24d5b7ba78648cef228d8b35d16e95ff46db305721de5f23bd',
      x86_64: '270e70447b7d59eb1db3ed2224f2542e45b864d6d56152236dcc22ea6a85cd1d'
   })
 
+  depends_on 'glibc' # R
+  depends_on 'libxi' => :build
+  depends_on 'libxinerama' => :build
   depends_on 'sommelier' => :build
 
-  def self.build
-    Dir.mkdir 'build'
-    Dir.chdir 'build' do
-      system "cmake #{CREW_CMAKE_OPTIONS} -DBUILD_SHARED_LIBS=ON .."
-      system 'make'
-    end
-  end
-
-  def self.install
-    Dir.chdir 'build' do
-      system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-    end
-  end
+  cmake_options '-DGLFW_BUILD_DOCS=OFF -DGLFW_BUILD_TESTS=OFF -DGLFW_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=ON'
 end