diff --git a/app/code/community/Webshopapps/Matrixrate/Model/Adminhtml/System/Config/Source/Shipping/Matrixrate.php b/app/code/community/Webshopapps/Matrixrate/Model/Adminhtml/System/Config/Source/Shipping/Matrixrate.php
new file mode 100644
index 0000000..3061484
--- /dev/null
+++ b/app/code/community/Webshopapps/Matrixrate/Model/Adminhtml/System/Config/Source/Shipping/Matrixrate.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Webshopapps Shipping Module
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * Shipping MatrixRates
+ *
+ * @category   Webshopapps
+ * @package    Webshopapps_Matrixrate
+ * @copyright  Copyright (c) 2010 Zowta Ltd (http://www.webshopapps.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ * @author     Karen Baker <sales@webshopapps.com>
+ */
+
+class Webshopapps_Matrixrate_Model_Adminhtml_System_Config_Source_Shipping_Matrixrate
+{
+    public function toOptionArray()
+    {
+
+        $tableRate = Mage::getSingleton('matrixrate_shipping/carrier_matrixrate');
+        $arr = array();
+        foreach ($tableRate->getCode('condition_name') as $k=>$v) {
+            $arr[] = array('value'=>$k, 'label'=>$v);
+        }
+        return $arr;
+    }
+}
\ No newline at end of file