diff --git a/ext/psych/depend b/ext/psych/depend
index 4947822c78..78bde9a53d 100644
--- a/ext/psych/depend
+++ b/ext/psych/depend
@@ -2,8 +2,12 @@ $(TARGET_SO): $(LIBYAML)
 
 libyaml $(LIBYAML):
 	cd libyaml && $(MAKE)
+	$(AR) $(ARFLAGS) $(LIBYAML) $(LIBYAML_OBJDIR)/*.$(OBJEXT)
+	$(RANLIB) $(LIBYAML)
+
 clean-so::
 	-cd libyaml && $(MAKE) clean
+
 distclean-so::
 	-cd libyaml && $(MAKE) distclean
 	-$(Q)$(RMDIRS) libyaml/* libyaml
diff --git a/ext/psych/extconf.rb b/ext/psych/extconf.rb
index f7e610ce88..54aa730f44 100644
--- a/ext/psych/extconf.rb
+++ b/ext/psych/extconf.rb
@@ -39,8 +39,9 @@ if yaml_source
   puts("Configuring libyaml source in #{yaml_source.quote}")
   yaml = "libyaml"
   Dir.mkdir(yaml) unless File.directory?(yaml)
+  shared = $enable_shared || !$static
   unless system(yaml_configure, "-q",
-                "--enable-#{$enable_shared || !$static ? 'shared' : 'static'}",
+                "--enable-#{shared ? 'shared' : 'static'}",
                 "--host=#{RbConfig::CONFIG['host'].sub(/-unknown-/, '-')}",
                 *(["CFLAGS=-w"] if RbConfig::CONFIG["GCC"] == "yes"),
                 chdir: yaml)
@@ -50,12 +51,16 @@ if yaml_source
   inc = yaml_source.start_with?("#$srcdir/") ? "$(srcdir)#{yaml_source[$srcdir.size..-1]}" : yaml_source
   $INCFLAGS << " -I#{yaml}/include -I#{inc}/include"
   Logging.message("INCLFAG=#$INCLFAG\n")
-  libyaml = "#{yaml}/src/.libs/libyaml.#$LIBEXT"
+  libyaml = "libyaml.#$LIBEXT"
+  $cleanfiles << libyaml
   $LOCAL_LIBS.prepend("$(LIBYAML) ")
 end
 
 create_makefile 'psych' do |mk|
   mk << "LIBYAML = #{libyaml}".strip << "\n"
+  mk << "LIBYAML_OBJDIR = libyaml/src#{shared ? '/.libs' : ''}\n"
+  mk << "OBJEXT = #$OBJEXT"
+  mk << "RANLIB = #{config_string('RANLIB') || config_string('NULLCMD')}\n"
 end
 
 # :startdoc: