diff --git a/Gemfile b/Gemfile
index 5dc00383..d2067ac8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,8 +2,6 @@ source 'http://rubygems.org'
 gem 'rake'
 
 gem 'httpclient'   # 2.1.5.2
-gem 'ox'                            # oxparser       ; Uses its own custom C-library
-gem 'libxml-ruby'                   # libxmlparser   ; Uses libxml2 
 
 if RUBY_VERSION.to_f <= 1.8
   gem 'htmlentities', '4.3.1'       # Require this if OxParser's built-in "Special Character" conversion isn't sufficient for your needs.
@@ -12,10 +10,17 @@ else
   gem 'htmlentities', '~> 4.3.3'    # Require this if OxParser's built-in "Special Character" conversion isn't sufficient for your needs.
   gem 'nokogiri',     '~> 1.6.6'    # nokogiriparser ; Uses libxml2, libxslt, and zlib
   gem 'oga'                         # ogaparser      ; Pure-Ruby Alternative ; Ruby 1.9 and above only.
-
   gem 'logger-application', :require=>'logger-application'
 end
 
+if RUBY_PLATFORM =~ /java/
+  gem 'libxml-jruby'                 # libxmlparser (Java Equivalent)
+else
+  gem 'libxml-ruby'                 # libxmlparser   ; Uses libxml2
+  gem 'ox'                            # oxparser       ; Uses its own custom C-library
+
+  gem 'curb'
+end
 
 ## # Testing Support ###
 group :test do
diff --git a/gemfiles/httpclient.gemfile b/gemfiles/httpclient.gemfile
index 3068acc0..5ab89256 100644
--- a/gemfiles/httpclient.gemfile
+++ b/gemfiles/httpclient.gemfile
@@ -5,20 +5,20 @@ gem 'httpclient', '~> 2.6'
 
 if RUBY_VERSION.to_f <= 1.8
   gem 'htmlentities', '4.3.1'       # Require this if OxParser's built-in "Special Character" conversion isn't sufficient for your needs.
-  gem 'ox'                          # oxparser       ; Uses its own custom C-library
   gem 'nokogiri', '~> 1.5.11'       # nokogiriparser ; Uses libxml2, libxslt, and zlib
 else
   gem 'htmlentities', '~> 4.3.3'    # Require this if OxParser's built-in "Special Character" conversion isn't sufficient for your needs.
-  gem 'ox'                          # oxparser       ; Uses its own custom C-library
   gem 'nokogiri',     '~> 1.6.6'    # nokogiriparser ; Uses libxml2, libxslt, and zlib
-
-  # gem 'oga'                         # ogaparser      ; Pure-Ruby Alternative ; Ruby 1.9 and above only.
-  gem 'oga', :git=>'https://github.com/rubyjedi/oga.git'
+  gem 'oga'                         # ogaparser      ; Pure-Ruby Alternative ; Ruby 1.9 and above only.
   gem 'logger-application', :require=>'logger-application'
 end
 
-gem 'libxml-ruby'                 # libxmlparser   ; Uses libxml2 
-
+if RUBY_PLATFORM =~ /java/
+  gem 'libxml-jruby'                 # libxmlparser (Java Equivalent)
+else
+  gem 'libxml-ruby'                 # libxmlparser   ; Uses libxml2
+  gem 'ox'                            # oxparser       ; Uses its own custom C-library
+end
 
 ### Testing Support ###
 group :test do