diff --git a/generator/ruby.ml b/generator/ruby.ml
index 686badb31..9e12caa86 100644
--- a/generator/ruby.ml
+++ b/generator/ruby.ml
@@ -76,6 +76,8 @@ extern VALUE m_guestfs;			/* guestfs module */
 extern VALUE c_guestfs;			/* guestfs_h handle */
 extern VALUE e_Error;			/* used for all errors */
 
+extern const rb_data_type_t guestfs_h_data_type; /* TypedData structure */
+
 extern VALUE guestfs_int_ruby_alloc_handle (VALUE klass);
 extern VALUE guestfs_int_ruby_initialize_handle (int argc, VALUE *argv, VALUE m);
 extern VALUE guestfs_int_ruby_compat_create_handle (int argc, VALUE *argv, VALUE module);
@@ -224,7 +226,7 @@ and generate_ruby_c actions () =
       pr ")\n";
       pr "{\n";
       pr "  guestfs_h *g;\n";
-      pr "  Data_Get_Struct (gv, guestfs_h, g);\n";
+      pr "  TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);\n";
       pr "  if (!g)\n";
       pr "    rb_raise (rb_eArgError, \"%%s: used handle after closing it\", \"%s\");\n"
         f.name;
diff --git a/ruby/ext/guestfs/handle.c b/ruby/ext/guestfs/handle.c
index ec42f26ba..ad2fb19f5 100644
--- a/ruby/ext/guestfs/handle.c
+++ b/ruby/ext/guestfs/handle.c
@@ -75,6 +75,15 @@ free_handle (void *gvp)
   }
 }
 
+/* TypedData structure for guestfs handle. */
+const rb_data_type_t guestfs_h_data_type = {
+  .wrap_struct_name = "guestfs_h",
+  .function = {
+    .dfree = free_handle,
+  },
+  .flags = RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 /* This is the ruby internal alloc function for the class.  We do nothing
  * here except allocate an object containing a NULL guestfs handle.
  * Note we cannot call guestfs_create here because we need the extra
@@ -89,7 +98,7 @@ guestfs_int_ruby_alloc_handle (VALUE klass)
   /* Wrap it, and make sure the close function is called when the
    * handle goes away.
    */
-  return Data_Wrap_Struct (c_guestfs, NULL, free_handle, g);
+  return TypedData_Wrap_Struct (c_guestfs, &guestfs_h_data_type, g);
 }
 
 static unsigned
@@ -166,7 +175,7 @@ guestfs_int_ruby_compat_create_handle (int argc, VALUE *argv, VALUE module)
   /* Don't print error messages to stderr by default. */
   guestfs_set_error_handler (g, NULL, NULL);
 
-  return Data_Wrap_Struct (c_guestfs, NULL, free_handle, g);
+  return TypedData_Wrap_Struct (c_guestfs, &guestfs_h_data_type, g);
 }
 
 /*
@@ -181,7 +190,7 @@ VALUE
 guestfs_int_ruby_close_handle (VALUE gv)
 {
   guestfs_h *g;
-  Data_Get_Struct (gv, guestfs_h, g);
+  TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);
 
   /* Clear the data pointer first so there's no chance of a double
    * close if a close callback does something bad like calling exit.
@@ -209,7 +218,7 @@ guestfs_int_ruby_set_event_callback (VALUE gv, VALUE cbv, VALUE event_bitmaskv)
   VALUE *root;
   char key[64];
 
-  Data_Get_Struct (gv, guestfs_h, g);
+  TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);
 
   event_bitmask = NUM2ULL (event_bitmaskv);
 
@@ -249,7 +258,7 @@ guestfs_int_ruby_delete_event_callback (VALUE gv, VALUE event_handlev)
   const int eh = NUM2INT (event_handlev);
   VALUE *root;
 
-  Data_Get_Struct (gv, guestfs_h, g);
+  TypedData_Get_Struct (gv, guestfs_h, &guestfs_h_data_type, g);
 
   snprintf (key, sizeof key, "_ruby_event_%d", eh);