diff --git a/doc/nhttpd/nhttpd_controlapi.html b/doc/nhttpd/nhttpd_controlapi.html
index c4d946ce0..2efa4c1e7 100644
--- a/doc/nhttpd/nhttpd_controlapi.html
+++ b/doc/nhttpd/nhttpd_controlapi.html
@@ -63,6 +63,10 @@
 		<td><a href="#info">Allgemeine Informationen</a></td>
 		<td><a href="http://box_ip/control/info">http://box_ip/control/info</a></td>
 	</tr>
+	<tr>
+		<td><a href="#boxinfo">Box Informationen</a></td>
+		<td><a href="http://box_ip/control/info">http://box_ip/control/boxinfo</a></td>
+	</tr>
 	<tr>
 		<td><a href="#getonidsid">Aktuellen Kanal abfragen</a></td>
 		<td><a href="http://box_ip/control/getonidsid">
@@ -1100,6 +1104,25 @@ Beispiel:<br>
 <br>
 </div>
 
+<!-- ----------------------------------------------------------- -->
+<div class="title1"><a name="boxinfo"></a><b>Boxinfo abfragen</b></div>
+<div class="URL">Handler: http://box_ip/control/boxinfo</div>
+<br>
+<b>Parameter:</b> <br>
+<b>R&uuml;ckgabe:</b><br>
+<br>
+Es wird der Hersteller, der Boxname und die Boxarchitektur zur&uuml;ckgegeben.<br>
+<br>
+<div class="example">
+Beispiel:<br>
+<br>
+&gt;&gt;&gt;http://box_ip/control/boxinfo<br>
+vendor=AX<br>
+boxname=H51<br>
+boxarch=BCM7251S<br>
+<br>
+</div>
+
 <!-- ----------------------------------------------------------- -->
 <div class="title1"><a name="getonidsid"></a><b>Aktuellen Kanal abfragen</b></div>
 <div class="URL">Handler: http://box_ip/control/getonidsid</div>
diff --git a/src/nhttpd/tuxboxapi/controlapi.cpp b/src/nhttpd/tuxboxapi/controlapi.cpp
index cf860a8bb..ec20d5e0a 100644
--- a/src/nhttpd/tuxboxapi/controlapi.cpp
+++ b/src/nhttpd/tuxboxapi/controlapi.cpp
@@ -223,6 +223,7 @@ const CControlAPI::TyCgiCall CControlAPI::yCgiCallList[]=
 	{"getdate",		&CControlAPI::GetDateCGI,		"text/plain"},
 	{"gettime",		&CControlAPI::GetTimeCGI,		"text/plain"},
 	{"info",		&CControlAPI::InfoCGI,			"text/plain"},
+	{"boxinfo",		&CControlAPI::BoxInfoCGI,		"text/plain"},
 	{"version",		&CControlAPI::VersionCGI,		""},
 	{"reloadsetup",		&CControlAPI::ReloadNeutrinoSetupCGI,	""},
 	{"reloadplugins",	&CControlAPI::ReloadPluginsCGI,		""},
@@ -877,6 +878,38 @@ void CControlAPI::InfoCGI(CyhookHandler *hh)
 	}
 }
 
+void CControlAPI::BoxInfoCGI(CyhookHandler *hh)
+{
+	std::string boxinfo(g_info.hw_caps->boxvendor);
+	/*
+	   I don't know the current legal situation.
+	   So better let's change the vendor's name to CST.
+
+	   After change this, you'll have to align code in Y_Blocks.txt
+	*/
+
+	if (boxinfo.compare("Coolstream") == 0) {
+		boxinfo = "CST";
+	}
+	std::string boxname(g_info.hw_caps->boxname);
+	if (strcmp(boxname.c_str(), "Neo") == 0)
+	{
+		// detecting Neo Twin by counting frontends
+		if (CFEManager::getInstance()->getFrontendCount() > 1)
+			boxname = "Neo Twin";
+	}
+
+	boxinfo  = "vendor=" + boxinfo;
+	boxinfo += "\n";
+	boxinfo += "boxname=";
+	boxinfo += boxname;
+	boxinfo += "\n";
+	boxinfo += "boxarch=";
+	boxinfo += g_info.hw_caps->boxarch;
+
+	hh->printf("%s\n", boxinfo.c_str());
+}
+
 void CControlAPI::HWInfoCGI(CyhookHandler *hh)
 {
 	static CNetAdapter netadapter; 
diff --git a/src/nhttpd/tuxboxapi/controlapi.h b/src/nhttpd/tuxboxapi/controlapi.h
index 1325aa657..d445277a0 100644
--- a/src/nhttpd/tuxboxapi/controlapi.h
+++ b/src/nhttpd/tuxboxapi/controlapi.h
@@ -91,6 +91,7 @@ private:
 	void GetTPChannel_IDCGI(CyhookHandler *hh);
 	void MessageCGI(CyhookHandler *hh);
 	void InfoCGI(CyhookHandler *hh);
+	void BoxInfoCGI(CyhookHandler *hh);
 	void HWInfoCGI(CyhookHandler *hh);
 	void ShutdownCGI(CyhookHandler *hh);
 	void VolumeCGI(CyhookHandler *hh);