diff --git a/CollectionClass.inc b/CollectionClass.inc
index 08f669e0..30035594 100644
--- a/CollectionClass.inc
+++ b/CollectionClass.inc
@@ -1,4 +1,4 @@
-<?php
+/<?php
 
 /**
  * @file
@@ -442,7 +442,7 @@ class CollectionClass {
     module_load_include('inc', 'fedora_repository', 'ConnectionHelper');
     $connectionHelper = new ConnectionHelper();
     try {
-      $soapClient = $connectionHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
+      $soapClient = $connectionHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M'));
       $pidNameSpace = variable_get('fedora_repository_pid', 'vre:');
       $pidNameSpace = substr($pidNameSpace, 0, strpos($pidNameSpace, ":"));
       $params = array(
diff --git a/api/fedora_item.inc b/api/fedora_item.inc
index e6477915..50330d6a 100644
--- a/api/fedora_item.inc
+++ b/api/fedora_item.inc
@@ -977,7 +977,7 @@ class Fedora_Item {
       self::$connection_helper = new ConnectionHelper();
     }
     $url = (array_search($function, self::$SoapManagedFunctions) !== FALSE) ?
-        variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl') :
+        variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M') :
         variable_get('fedora_soap_url', 'http://localhost:8080/fedora/services/access?wsdl');
     try {
       $soap_client = self::$connection_helper->getSoapClient($url);
diff --git a/fedora_repository.info b/fedora_repository.info
index 5d3762e4..6d3135d1 100644
--- a/fedora_repository.info
+++ b/fedora_repository.info
@@ -4,5 +4,5 @@ dependencies[] = tabs
 dependencies[] = islandora_content_model_forms
 description = Shows a list of items in a fedora collection.
 package = Islandora
-version = 11.3.1
+version = 6.x-12.1-RC1
 core = 6.x
diff --git a/fedora_repository.module b/fedora_repository.module
index f477e9f5..06d220c7 100644
--- a/fedora_repository.module
+++ b/fedora_repository.module
@@ -538,7 +538,7 @@ function fedora_repository_purge_object_form_submit($form, &$form_state) {
     );
     try {
       $soapHelper = new ConnectionHelper();
-      $client = $soapHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
+      $client = $soapHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M'));
       $object = $client->__soapCall('purgeObject', array($params));
       unset($form_state['storage']['confirm']);
     } catch (exception $e) {
@@ -597,7 +597,6 @@ function fedora_repository_purge_stream_form(&$form_state, $pid, $dsId) {
 function fedora_repository_purge_stream_form_submit($form, &$form_state) {
   global $base_url;
   module_load_include('inc', 'fedora_repository', 'api/fedora_item');
-//$client = getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
   $pid = $form_state['values']['pid'];
   $item = new Fedora_Item($pid);
   $dsid = $form_state['values']['dsid'];
@@ -636,9 +635,7 @@ function fedora_repository_replace_stream($pid, $dsId, $dsLabel = '', $collectio
  * @return type 
  */
 function fedora_repository_replace_stream_form(&$form_state, $pid, $dsId, $dsLabel) {
-//module_load_module_load_include('hp', ''Fedora_Repository'', 'config', 'fedora_repository', '');
   module_load_include('inc', 'Fedora_Repository', 'formClass');
-//$client = getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
   $replaceDataStreamForm = new formClass();
   return $replaceDataStreamForm->createReplaceDataStreamForm($pid, $dsId, $dsLabel, $form_state);
 }
@@ -832,11 +829,10 @@ function fedora_repository_edit_qdc_form_submit($form, &$form_state) {
     global $base_url;
     if (strstr($form_state['clicked_button']['#id'], 'edit-submit')) {
 
-//$client = getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
       $soap_helper = new ConnectionHelper();
-      $client = $soap_helper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
+      $client = $soap_helper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M'));
 
-// Check the content model for a custom edit metadata form submit function.
+      // Check the content model for a custom edit metadata form submit function.
       if (isset($form_state['values']['pid'])) {
         module_load_include('inc', 'fedora_repository', 'ContentModel');
         if (($cm = ContentModel::loadFromObject($form_state['values']['pid'])) !== FALSE) {
diff --git a/formClass.inc b/formClass.inc
index 0fa07e98..8512fd61 100644
--- a/formClass.inc
+++ b/formClass.inc
@@ -255,7 +255,7 @@ class formClass {
     $form['fedora_soap_manage_url'] = array(
       '#type' => 'textfield',
       '#title' => t('Fedora SOAP management URL'),
-      '#default_value' => variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'), '#description' => t('The URL to use for SOAP API-M connections'),
+      '#default_value' => variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M'), '#description' => t('The URL to use for SOAP API-M connections'),
       '#required' => TRUE,
       '#weight' => -10
     );
diff --git a/plugins/Flv.inc b/plugins/Flv.inc
index b5f159b2..8d2079b6 100644
--- a/plugins/Flv.inc
+++ b/plugins/Flv.inc
@@ -110,7 +110,7 @@ class FormBuilder {
 
     try {
       $soapHelper = new ConnectionHelper();
-      $client = $soapHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
+      $client = $soapHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M'));
 
       if ($client == NULL) {
         drupal_set_message(t('Error getting SOAP client.'), 'error');
diff --git a/plugins/Refworks.inc b/plugins/Refworks.inc
index 2c86caa7..70b0abeb 100644
--- a/plugins/Refworks.inc
+++ b/plugins/Refworks.inc
@@ -286,7 +286,7 @@ class Refworks {
 
       try {
         $soapHelper = new ConnectionHelper();
-        $client = $soapHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/services/management?wsdl'));
+        $client = $soapHelper->getSoapClient(variable_get('fedora_soap_manage_url', 'http://localhost:8080/fedora/wsdl?api=API-M'));
 
         if ($client == NULL) {
           drupal_set_message(t('Error getting SOAP client.'), 'error');