diff --git a/c++/rotclass.cc b/c++/rotclass.cc
new file mode 100644
index 000000000..2e2a240c6
--- /dev/null
+++ b/c++/rotclass.cc
@@ -0,0 +1,122 @@
+/**
+ * \file src/rotclass.cc
+ * \brief Ham Radio Control Libraries C++ interface
+ * \author Stephane Fillod
+ * \date 2002
+ *
+ * Hamlib C++ interface is a frontend implementing wrapper functions.
+ */
+
+/*
+ *  Hamlib C++ bindings - main file
+ *  Copyright (c) 2002 by Stephane Fillod
+ *
+ *		$Id: rotclass.cc,v 1.1 2002-01-16 22:43:29 fillods Exp $
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2 of
+ *   the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Library General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Library General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <hamlib/rotator.h>
+#include <hamlib/rotclass.h>
+#include <hamlib/rigclass.h>
+
+#define CHECK_ROT(cmd) { int _retval = cmd; if (_retval != RIG_OK) \
+							THROW(new RigException (_retval)); }
+
+
+
+Rotator::Rotator(rot_model_t rot_model)
+{
+	theRot = rot_init(rot_model);
+   	if (!theRot)
+		THROW(new RigException ("Rotator initialization error"));
+
+	caps = theRot->caps;
+	theRot->state.obj = (rig_ptr_t)this;
+}
+
+Rotator::~Rotator()
+{
+	theRot->state.obj = NULL;
+	CHECK_ROT( rot_cleanup(theRot) );
+	caps = NULL;
+}
+
+void Rotator::open(void) {
+	CHECK_ROT( rot_open(theRot) );
+}
+
+void Rotator::close(void) {
+	CHECK_ROT( rot_close(theRot) );
+}
+
+void Rotator::setConf(token_t token, const char *val)
+{
+	CHECK_ROT( rot_set_conf(theRot, token, val) );
+}
+void Rotator::setConf(const char *name, const char *val)
+{
+	CHECK_ROT( rot_set_conf(theRot, tokenLookup(name), val) );
+}
+
+void Rotator::getConf(token_t token, char *val)
+{
+	CHECK_ROT( rot_get_conf(theRot, token, val) );
+}
+void Rotator::getConf(const char *name, char *val)
+{
+	CHECK_ROT( rot_get_conf(theRot, tokenLookup(name), val) );
+}
+
+token_t Rotator::tokenLookup(const char *name)
+{
+	return rot_token_lookup(theRot, name);
+}
+
+void Rotator::setPosition(azimuth_t az, elevation_t el)
+{
+	CHECK_ROT( rot_set_position(theRot, az, el) );
+}
+
+void Rotator::getPosition(azimuth_t& az, elevation_t& el)
+{
+	CHECK_ROT( rot_get_position(theRot, &az, &el) );
+}
+
+void Rotator::stop()
+{
+	CHECK_ROT(rot_stop(theRot));
+}
+
+void Rotator::park()
+{
+	CHECK_ROT(rot_park(theRot));
+}
+
+void Rotator::reset (rot_reset_t reset)
+{
+	CHECK_ROT( rot_reset(theRot, reset) );
+}
+
+void Rotator::move (int direction, int speed)
+{
+	CHECK_ROT( rot_move(theRot, direction, speed) );
+}
+
diff --git a/include/hamlib/rotclass.h b/include/hamlib/rotclass.h
new file mode 100644
index 000000000..4d544c3ef
--- /dev/null
+++ b/include/hamlib/rotclass.h
@@ -0,0 +1,65 @@
+/*
+ *  Hamlib C++ bindings - rotator API header
+ *  Copyright (c) 2002 by Stephane Fillod
+ *
+ *		$Id: rotclass.h,v 1.1 2002-01-16 22:43:29 fillods Exp $
+ *
+ *   This library is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU Library General Public License as
+ *   published by the Free Software Foundation; either version 2 of
+ *   the License, or (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU Library General Public License for more details.
+ *
+ *   You should have received a copy of the GNU Library General Public
+ *   License along with this library; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
+#ifndef _ROTCLASS_H
+#define _ROTCLASS_H 1
+
+#include <hamlib/rotator.h>
+
+
+
+class BACKEND_IMPEXP Rotator {
+private:
+  ROT* theRot;  // Global ref. to the rot
+
+protected:
+public:
+  Rotator(rot_model_t rot_model);
+
+  virtual ~Rotator();
+
+  const struct rot_caps *caps;
+
+  // This method open the communication port to the rot
+  void open(void);
+
+  // This method close the communication port to the rot
+  void close(void);
+
+  void setConf(token_t token, const char *val);
+  void setConf(const char *name, const char *val);
+  void getConf(token_t token, char *val);
+  void getConf(const char *name, char *val);
+  token_t tokenLookup(const char *name);
+
+  void setPosition(azimuth_t az, elevation_t el);
+  void getPosition(azimuth_t& az, elevation_t& el);
+  void stop();
+  void park();
+  void reset (rot_reset_t reset);
+
+  void move(int direction, int speed);
+};
+ 
+
+
+#endif	// _ROTCLASS_H