diff --git a/RELEASE-0.2.0 b/RELEASE-0.2.0
new file mode 100644
index 0000000..5cacecb
--- /dev/null
+++ b/RELEASE-0.2.0
@@ -0,0 +1,3 @@
+Fixes:
+
+ - Add support for channels using https [saltybeagle]
\ No newline at end of file
diff --git a/extrasetup.php b/extrasetup.php
index 4055b78..2dc5592 100644
--- a/extrasetup.php
+++ b/extrasetup.php
@@ -1,12 +1,12 @@
 <?php
 
-$pyrus = new \PEAR2\Pyrus\Package(__DIR__ . '/../../Pyrus/package.xml');
+$pyrus = new \PEAR2\Pyrus\Package(__DIR__ . '/../PEAR2_Pyrus/package.xml');
 $pyrus->setPackagingFilter('PEAR2\Pyrus\PackageFile\v2Iterator\MinimalPackageFilter');
 $extrafiles = array(
-    new \PEAR2\Pyrus\Package(__DIR__ . '/../../HTTP_Request/package.xml'),
+    new \PEAR2\Pyrus\Package(__DIR__ . '/../PEAR2_HTTP_Request/package.xml'),
     $pyrus,
-    new \PEAR2\Pyrus\Package(__DIR__ . '/../../Pyrus_Developer/package.xml'),
-    new \PEAR2\Pyrus\Package(__DIR__ . '/../../Exception/package.xml'),
-    new \PEAR2\Pyrus\Package(__DIR__ . '/../../MultiErrors/package.xml'),
+    new \PEAR2\Pyrus\Package(__DIR__ . '/../PEAR2_Pyrus_Developer/package.xml'),
+    new \PEAR2\Pyrus\Package(__DIR__ . '/../PEAR2_Exception/package.xml'),
+    new \PEAR2\Pyrus\Package(__DIR__ . '/../PEAR2_MultiErrors/package.xml'),
 );
 ?>
diff --git a/makepackage.php b/makepackage.php
deleted file mode 100644
index 53fa93d..0000000
--- a/makepackage.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-error_reporting(E_ALL);
-ini_set('display_errors',true);
-require_once dirname(__FILE__).'/../../autoload.php';
-
-$a = new \PEAR2\Pyrus\Developer\PackageFile\PEAR2SVN(dirname(__FILE__), 'PEAR2_SimpleChannelServer');
-
-$package = new \PEAR2\Pyrus\Package('package.xml');
-$outfile = $package->name.'-'.$package->version['release'];
-$a = new \PEAR2\Pyrus\Package\Creator(array(
-                    //new \PEAR2\Pyrus\Developer\Creator\Tar($outfile.'.tar', 'none'),
-                    new \PEAR2\Pyrus\Developer\Creator\Phar($outfile.'.tgz', false, Phar::TAR, Phar::GZ),),
-                    dirname(__FILE__).'/../../Exception/src',
-					dirname(__FILE__).'/../../Autoload/src',
-					dirname(__FILE__).'/../../MultiErrors/src');
-$a->render($package);
-
-$a = new \PEAR2\Pyrus\Package\Creator(array(
-                    new \PEAR2\Pyrus\Developer\Creator\Phar(__DIR__ . '/pearscs.phar', '<?php
-function __autoload($class)
-{
-    include \'phar://\' . PYRUS_PHAR_FILE . \'/PEAR2_SimpleChannelServer-' .
-    $package->version['release'] . '/php/\' . implode(\'/\', explode(\'_\', $class)) . \'.php\';
-}
-set_include_path(\'phar://\' . PYRUS_PHAR_FILE . \'/PEAR2_SimpleChannelServer-' .
-    $package->version['release'] . '/php/\'.PATH_SEPARATOR.get_include_path());
-$cli = new \PEAR2\SimpleChannelServer\CLI();
-$cli->process();
-'),),
-                    dirname(__FILE__) . '/../../Exception/src',
-                    dirname(__FILE__) . '/../../Autoload/src',
-                    dirname(__FILE__) . '/../../MultiErrors/src');
-$b = new \PEAR2\Pyrus\Package(__DIR__ . '/package.xml');
-$rp = __DIR__ . '/../../HTTP_Request/src/HTTP';
-
-$additional_files = array(
-    'php/PEAR2/HTTP/Request.php'                   => $rp . '/Request.php',
-    'php/PEAR2/HTTP/Request/Adapter.php'           => $rp . '/Request/Adapter.php',
-    'php/PEAR2/HTTP/Request/Adapter/Phpsocket.php' => $rp . '/Request/Adapter/Phpsocket.php',
-    'php/PEAR2/HTTP/Request/Adapter/Phpstream.php' => $rp . '/Request/Adapter/Phpstream.php',
-    'php/PEAR2/HTTP/Request/Exception.php'         => $rp . '/Request/Exception.php',
-    'php/PEAR2/HTTP/Request/Headers.php'           => $rp . '/Request/Headers.php',
-    'php/PEAR2/HTTP/Request/Response.php'          => $rp . '/Request/Response.php',
-    'php/PEAR2/HTTP/Request/Uri.php'               => $rp . '/Request/Uri.php',
-);
-$pyrus = new \PEAR2\Pyrus\Package(__DIR__ . '/../../Pyrus/package.xml');
-$pyrus_developer = new \PEAR2\Pyrus\Package(__DIR__ . '/../../Pyrus_Developer/package.xml');
-$exception = new \PEAR2\Pyrus\Package(__DIR__ . '/../../Exception/package.xml');
-foreach (array('Pyrus'           => $pyrus,
-               'Pyrus_Developer' => $pyrus_developer,
-               'Exception'       => $exception) as $add_dir=>$add_package) {
-    foreach ($add_package->installcontents as $filename=>$details) {
-        $add_filename = __DIR__ . '/../../'.$add_dir.'/'.$filename;
-        switch($details['attribs']['role']) {
-            case 'php':
-                $additional_files[str_replace('src/','php/PEAR2/', $filename)] = $add_filename;
-                break;
-            case 'data':
-                $additional_files['php/'.$filename] = $add_filename;
-                $additional_files[$filename]        = $add_filename;
-                break;
-        }
-    }
-}
-$a->render($b, $additional_files);
-
-?>
diff --git a/package.xml b/package.xml
index 467a4b8..3da68d0 100644
--- a/package.xml
+++ b/package.xml
@@ -27,10 +27,10 @@ More information here: http://pear.php.net/manual/en/channels.scs.php
   <email>brett.bieber@gmail.com</email>
   <active>yes</active>
  </lead>
- <date>2010-06-10</date>
- <time>10:49:14</time>
+ <date>2011-05-11</date>
+ <time>18:21:17</time>
  <version>
-  <release>0.1.0</release>
+  <release>0.2.0</release>
   <api>0.1.0</api>
  </version>
  <stability>
@@ -38,11 +38,9 @@ More information here: http://pear.php.net/manual/en/channels.scs.php
   <api>alpha</api>
  </stability>
  <license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
- <notes>First attempt.
+ <notes>Fixes:
 
-Namespace of PEAR2.
-Basic functionality including categories working.
-</notes>
+ - Add support for channels using https [saltybeagle]</notes>
  <contents>
   <dir name="/">
    <dir name="customcommand" baseinstalldir="/">
@@ -55,24 +53,26 @@ Basic functionality including categories working.
    <dir name="scripts" baseinstalldir="/">
     <file role="script" name="pearscs"/>
    </dir>
-   <dir name="src" baseinstalldir="PEAR2">
-    <dir name="SimpleChannelServer">
-     <dir name="Categories">
+   <dir name="src" baseinstalldir="/">
+    <dir name="PEAR2">
+     <dir name="SimpleChannelServer">
+      <dir name="Categories">
+       <file role="php" name="Exception.php"/>
+      </dir>
+      <dir name="REST">
+       <file role="php" name="Category.php"/>
+       <file role="php" name="Maintainer.php"/>
+       <file role="php" name="Manager.php"/>
+       <file role="php" name="Package.php"/>
+       <file role="php" name="Release.php"/>
+      </dir>
+      <file role="php" name="Categories.php"/>
+      <file role="php" name="Channel.php"/>
+      <file role="php" name="CLI.php"/>
       <file role="php" name="Exception.php"/>
+      <file role="php" name="Get.php"/>
+      <file role="php" name="Main.php"/>
      </dir>
-     <dir name="REST">
-      <file role="php" name="Category.php"/>
-      <file role="php" name="Maintainer.php"/>
-      <file role="php" name="Manager.php"/>
-      <file role="php" name="Package.php"/>
-      <file role="php" name="Release.php"/>
-     </dir>
-     <file role="php" name="Categories.php"/>
-     <file role="php" name="Channel.php"/>
-     <file role="php" name="CLI.php"/>
-     <file role="php" name="Exception.php"/>
-     <file role="php" name="Get.php"/>
-     <file role="php" name="Main.php"/>
     </dir>
    </dir>
   </dir>
diff --git a/package_compatible.xml b/package_compatible.xml
index f5a1a67..b3b3ad0 100644
--- a/package_compatible.xml
+++ b/package_compatible.xml
@@ -27,10 +27,10 @@ More information here: http://pear.php.net/manual/en/channels.scs.php
   <email>brett.bieber@gmail.com</email>
   <active>yes</active>
  </lead>
- <date>2010-06-10</date>
- <time>10:49:15</time>
+ <date>2011-05-11</date>
+ <time>18:21:17</time>
  <version>
-  <release>0.1.0</release>
+  <release>0.2.0</release>
   <api>0.1.0</api>
  </version>
  <stability>
@@ -38,11 +38,9 @@ More information here: http://pear.php.net/manual/en/channels.scs.php
   <api>alpha</api>
  </stability>
  <license uri="http://www.opensource.org/licenses/bsd-license.php">New BSD License</license>
- <notes>First attempt.
+ <notes>Fixes:
 
-Namespace of PEAR2.
-Basic functionality including categories working.
-</notes>
+ - Add support for channels using https [saltybeagle]</notes>
  <contents>
   <dir name="/">
    <file role="script" name="script/pearscs"/>
@@ -58,9 +56,9 @@ Basic functionality including categories working.
    <file role="php" name="php/PEAR2/SimpleChannelServer/Channel.php"/>
    <file role="php" name="php/PEAR2/SimpleChannelServer/Categories/Exception.php"/>
    <file role="php" name="php/PEAR2/SimpleChannelServer/Categories.php"/>
-   <file role="doc" name="doc/PEAR2_SimpleChannelServer/pear2.php.net/examples/examples/upgradeFromChiara.php"/>
-   <file role="doc" name="doc/PEAR2_SimpleChannelServer/pear2.php.net/examples/examples/update_channel.php"/>
-   <file role="data" name="customcommand/PEAR2_SimpleChannelServer/pear2.php.net/commands.xml"/>
+   <file role="doc" name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/upgradeFromChiara.php"/>
+   <file role="doc" name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/update_channel.php"/>
+   <file role="data" name="customcommand/pear2.php.net/PEAR2_SimpleChannelServer/commands.xml"/>
   </dir>
  </contents>
  <dependencies>
@@ -83,9 +81,9 @@ Basic functionality including categories working.
  </dependencies>
  <phprelease>
   <filelist>
-   <install name="customcommand/PEAR2_SimpleChannelServer/pear2.php.net/commands.xml" as="pear2.php.net/commands.xml"/>
-   <install name="doc/PEAR2_SimpleChannelServer/pear2.php.net/examples/examples/update_channel.php" as="pear2.php.net/examples/examples/update_channel.php"/>
-   <install name="doc/PEAR2_SimpleChannelServer/pear2.php.net/examples/examples/upgradeFromChiara.php" as="pear2.php.net/examples/examples/upgradeFromChiara.php"/>
+   <install name="customcommand/pear2.php.net/PEAR2_SimpleChannelServer/commands.xml" as="PEAR2_SimpleChannelServer/commands.xml"/>
+   <install name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/update_channel.php" as="PEAR2_SimpleChannelServer/examples/examples/update_channel.php"/>
+   <install name="doc/pear2.php.net/PEAR2_SimpleChannelServer/examples/examples/upgradeFromChiara.php" as="PEAR2_SimpleChannelServer/examples/examples/upgradeFromChiara.php"/>
    <install name="php/PEAR2/SimpleChannelServer/Categories.php" as="PEAR2/SimpleChannelServer/Categories.php"/>
    <install name="php/PEAR2/SimpleChannelServer/Categories/Exception.php" as="PEAR2/SimpleChannelServer/Categories/Exception.php"/>
    <install name="php/PEAR2/SimpleChannelServer/Channel.php" as="PEAR2/SimpleChannelServer/Channel.php"/>