diff --git a/ChangeLog b/ChangeLog
index eb5ff41b6a..4037f30bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Nov 13 17:19:36 2013  Zachary Scott  <e@zzak.io>
+
+	* ext/openssl/lib/openssl/config.rb: In #parse use +string+ for +str+
+
 Wed Nov 13 17:09:45 2013  Zachary Scott  <e@zzak.io>
 
 	* ext/openssl/lib/openssl/*.rb: [DOC] Document the following:
diff --git a/ext/openssl/lib/openssl/config.rb b/ext/openssl/lib/openssl/config.rb
index 9f5c6affac..5716d59fd6 100644
--- a/ext/openssl/lib/openssl/config.rb
+++ b/ext/openssl/lib/openssl/config.rb
@@ -29,12 +29,12 @@ module OpenSSL
     class << self
 
       ##
-      # Parses a given +str+ as a blob that contains configuration for openssl.
+      # Parses a given +string+ as a blob that contains configuration for openssl.
       #
       # If the source of the IO is a file, then consider using #parse_config.
-      def parse(str)
+      def parse(string)
         c = new()
-        parse_config(StringIO.new(str)).each do |section, hash|
+        parse_config(StringIO.new(string)).each do |section, hash|
           c[section] = hash
         end
         c