diff --git a/course/lib.php b/course/lib.php
index 1b1ebea..9896922 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -797,7 +797,7 @@ function print_log_graph($course, $userid=0, $type="course.png", $date=0) {
 }
 
 
-function print_overview($courses) {
+function print_overview($courses, $remote_courses) {
 
     global $CFG, $USER;
 
@@ -827,6 +827,14 @@ function print_overview($courses) {
         }
         print_simple_box_end();
     }
+
+    foreach ($remote_courses as $course) {
+        print_simple_box_start('center', '100%', '', 5, "coursebox");
+        print_heading('<a title="' . format_string($course->shortname) . '" '.
+                      "href=\"{$CFG->wwwroot}/auth/mnet/jump.php?hostid={$course->hostid}&amp;wantsurl=/course/view.php%3Fid={$course->remoteid}\">"
+                      . format_string($course->fullname) . '</a>');
+        print_simple_box_end();
+    }
 }
 
 
diff --git a/my/index.php b/my/index.php
index 15e0296..82159c5 100644
--- a/my/index.php
+++ b/my/index.php
@@ -101,9 +101,20 @@
     $site = get_site();
     $course = $site; //just in case we need the old global $course hack
 
-    if (($courses_limit > 0) && (count($courses) >= $courses_limit)) {
-        //remove the 'marker' course that we retrieve just to see if we have more than $courses_limit
-        array_pop($courses);
+    if (is_enabled_auth('mnet')) {
+        $remote_courses = get_my_remotecourses();
+    }
+    if (empty($remote_courses)) {
+        $remote_courses = array();
+    }
+
+    if (($courses_limit > 0) && (count($courses)+count($remote_courses) >= $courses_limit)) {
+        // get rid of any remote courses that are above the limit
+        $remote_courses = array_slice($remote_courses, 0, $courses_limit - count($courses), TRUE);
+        if (count($courses) >= $courses_limit) {
+            //remove the 'marker' course that we retrieve just to see if we have more than $courses_limit
+            array_pop($courses);
+        }
         $morecourses = true;
     }
 
@@ -119,10 +130,10 @@
         }
     }
     
-    if (empty($courses)) {
+    if (empty($courses) && empty($remote_courses)) {
         print_simple_box(get_string('nocourses','my'),'center');
     } else {
-        print_overview($courses);
+        print_overview($courses, $remote_courses);
     }
     
     // if more than 20 courses