diff --git a/fake_joint/CMakeLists.txt b/fake_joint/CMakeLists.txt
new file mode 100644
index 0000000..37e8f6c
--- /dev/null
+++ b/fake_joint/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 2.8.3)
+project(fake_joint)
+find_package(catkin REQUIRED)
+catkin_metapackage()
diff --git a/fake_joint/package.xml b/fake_joint/package.xml
new file mode 100644
index 0000000..4e6e202
--- /dev/null
+++ b/fake_joint/package.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<package format="2">
+  <name>fake_joint</name>
+  <version>0.0.0</version>
+  <description>
+    This metapackage depends on fake-joint related package for ros_control.
+  </description>
+  <author email="ryosuke.tajima@opensource-robotics.tokyo.jp">Ryosuke Tajima</author>
+  <maintainer email="dev@opensource-robotics.tokyo.jp">Tokyo Opensource Robotics Kyokai (TORK) Developer Team</maintainer>
+  <license>Apache License 2.0</license>
+
+  <url type="website">http://wiki.ros.org/fake_joint</url>
+  <url type="repository">https://github.com/tork-a/fake_joint</url>
+  <url type="bugtracker">https://github.com/tork-a/fake_joint/issues</url>
+
+  <buildtool_depend>catkin</buildtool_depend>
+
+  <exec_depend>fake_joint_driver</exec_depend>
+  <exec_depend>fake_joint_launch</exec_depend>  
+
+  <export>
+    <metapackage/>
+  </export>
+</package>
diff --git a/fake_joint_driver/package.xml b/fake_joint_driver/package.xml
index 6220b74..0cb2f5b 100644
--- a/fake_joint_driver/package.xml
+++ b/fake_joint_driver/package.xml
@@ -9,8 +9,8 @@
   <license>Apache License 2.0</license>
 
   <url type="website">http://wiki.ros.org/fake_joint_driver</url>
-  <url type="repository">https://github.com/tork-a/fake_joint_driver</url>
-  <url type="bugtracker">https://github.com/tork-a/fake_joint_driver/issues</url>
+  <url type="repository">https://github.com/tork-a/fake_joint</url>
+  <url type="bugtracker">https://github.com/tork-a/fake_joint/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
diff --git a/fake_joint_launch/package.xml b/fake_joint_launch/package.xml
index 502df29..e16fd55 100644
--- a/fake_joint_launch/package.xml
+++ b/fake_joint_launch/package.xml
@@ -2,14 +2,15 @@
 <package format="2">
   <name>fake_joint_launch</name>
   <version>0.0.1</version>
-  <description>Collection of the launch files for fake_joint_driver</description>
-
+  <description>Collection of the launch files for fake_joint_driver.</description>
+  <author email="ryosuke.tajima@opensource-robotics.tokyo.jp">Ryosuke Tajima</author>
   <maintainer email="dev@opensource-robotics.tokyo.jp">Tokyo Opensource Robotics Kyokai (TORK) Developer Team</maintainer>
 
   <license>Apache License 2.0</license>
 
   <url type="website">http://wiki.ros.org/fake_joint_launch</url>
-  <author email="ryosuke.tajima@opensource-robotics.tokyo.jp">Ryosuke Tajima</author>
+  <url type="repository">https://github.com/tork-a/fake_joint</url>
+  <url type="bugtracker">https://github.com/tork-a/fake_joint/issues</url>
 
   <buildtool_depend>catkin</buildtool_depend>